Commit Graph

8408 Commits

Author SHA1 Message Date
oranges 438b46cc17 Prevent infinite loops with DROPDEL items
We unset the flag just before calling qdel, preventing infinite loops
where the objects Destroy calls dropped, which is the case for a
number of items
2016-09-14 23:48:25 +00:00
Joan Lung 313ecf3843 Merge pull request #20498 from phil235/RewriteMegaphone
Megaphones no longer have special say code to handle their effect.
2016-09-14 16:35:01 -04:00
Cheridan 3e3102038d Merge pull request #20476 from ChangelingRain/takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon
Removes the horrible anim() proc and a bunch of spawns
2016-09-13 12:10:10 -05:00
Cheridan 2a0168abdb Merge pull request #20434 from ChangelingRain/idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Moves all beam icon states to beams.dmi
2016-09-13 11:55:24 -05:00
phil235 441a88c488 Megaphone no longer have special say code to handle their effect.
The megaphone is no longer used by clicking it and entering a message, you simply keep it in your active hand and talk normally.
Remove the insults feature of the emagged megaphone. The span of the emagged megaphone is now big and red.
2016-09-13 18:27:55 +02:00
AnturK 4709b5229b Merge pull request #20475 from optimumtact/throwat
Fix a bunch of incorrect throw_at proc definitions that caused a runtime
2016-09-13 15:41:00 +02:00
oranges ccea988320 Stunbaton throw now only stuns living mobs (#20474)
Other type paths do not have the required Stun and Weaken procs and
therefore cause runtimes
2016-09-13 15:40:21 +02:00
Joan Lung 0067bd1332 Adds brass, used to construct various brass objects (#20419)
* Adds brass, used to construct various brass objects

* brasshole

* give em the brass

* give em more brass

* DYNAMIC

* VAR MURDER SPREE

* brassy

* acceptaphil

* this is super against my general preferences but eeeeeh sure okay i guess
2016-09-13 12:16:28 +02:00
oranges 6fbcc6e26b Fix a bunch of incorrect throw_at proc definitions that caused a runtime 2016-09-12 22:09:52 +00:00
Joan Lung 9c6fdc97f6 Makes mineral doors marginally less shitty (#20429)
* Makes mineral doors marginally less shitty

* TESTING IS FOR LIZARDS

* TYPING IS ALSO FOR LIZARDS
2016-09-13 09:19:21 +12:00
Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur
Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi
2016-09-12 17:14:39 -04:00
PKPenguin321 f2b6543c1b tesla grille nerf (#20412) 2016-09-13 09:07:47 +12:00
TechnoAlchemist eec3391270 Allows for sabre renaming. (#20367)
* Allows for sabre renaming.

* That's not supposed to be there

* Applies unique_rename to all /weapons

* fixes my stupid asshole
2016-09-13 09:05:30 +12:00
Joan Lung f10ac32b69 Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon
Conflicts:
	icons/mob/mob.dmi
2016-09-12 15:10:29 -04:00
phil235 443a4501ec Carbon Dismemberment , second attempt. (#20461)
* - I rearranged X_defense.dm mob files, more damage_procs.dm.Here's what's inside:
* X_defense.dm: is for the procs of attacks onto the mob, all the XXX_act() proc (things happening to the mob), as well as protection check and get procs (armor, ear prot, projectile dismemberment)
* damage_procs.dm: actual damage procs like adjustBruteLoss() getfireloss, any proc that handles damaging.

- some bugfixes with gibspawner effects.
- monkey's bodyparts can be dismembered and are used to create its icon.
- brains are no longer carbons.
- all carbon have bodyparts that can be dropped when the mob is gibbed.
- adminspawned bodyparts now have a default icon.
- robotic parts are now a child of bodyparts.
- health analyzer on alien/monkey shows damage on each limb
- added admin option to add/remove bodyparts for all carbon (instead of just remove on humans)
- Fixes keycheck message spam for janicart and all when trying to move.
- Fixes bug with buckling to a scooter while limbless.
- removed arg "hit_zone" in proj's on_hit() because we can already use the def_zone var (where hit_zone got its value)
- Fixes mob not getting any damage when hit by a projectile on their missing limb, despite a hit message shown). carbon/apply_damage() now when we specify a def_zone and the corresponding BP is missing we default to the chest instead of stopping the proc. Consistently with how human/attacked_by() default to its attack to chest if missing limb.
- Fixes mini uzi icon when empty and no mag (typo).
- I renamed and changed a bit check_eye_prot and ear prot
- renamed flash_eyes to flash_act()
- I made a soundbang_act() similar to flash_act but for loud bangs.
- added a gib and dust animation to larva.
- husked monkeys
- no damage overlay for husk or skeleton.
- damage overlay for robotic limb now.
- no damage overlay when organic bodypart husked.
- one handed human with a bloody hand still get a bloody single hand overlay.
- fix admin heal being unable to heal robotic bodyparts.
- slightly touched robotic bodypart sprites (head one pixel too high)
- Fixes 18532 "beheaded husk has hair".
- Fixes 18584 "Ling stasis appearance bug"
- no more eyes or lipstick on husks.
- can remove flashes/wires/cells from robot chest and head with crowbar.
- Fixes not being able to surgically amputate robotic arm/leg.

* More merge conflict fixes and adding the new files I forgot to add.

* of course I forgot birdstation

* More typos and stuff I forgot to undo.

* Fixing a typo in examine.dm
Removing an unnecessary check.
Making admin heal regenerate limbs on all carbons.
Monkey-human transformation now transfer missing limbs info and presence of a cavity implant.
NODISMEMBER species can still lack a limb if the mob lacked a limb and changed into that new species.
Changeling Regenerate ability now also regenerate limbs when in monkey form. (and remove some cryptic useless code)

* Fixing more conflicts with remie's multihands PR.

* Fixes runtime with hud when calling build_hand_slots().
Fixes lightgeist healing not working.
Fixes null.handle_fall() runtimes with pirate mobs.
Fixes typo in has_left_hadn() and has_right_hand().

* Derp, forgot to remove debug message.
2016-09-12 19:33:50 +02:00
Joan Lung 6bc1981246 may this also die 2016-09-12 10:43:14 -04:00
Joan Lung 1616b7a237 Removes the horrible anim() proc and a bunch of spawns 2016-09-12 09:25:59 -04:00
nullbear 2a58dd54a9 Adds explosion helper proc w/ diminishing returns (#20319)
* Adds new explosion proc

Adds a new proc for calling explosions, which uses 'power' instead of a
set of ranges.

Power (1 - 100) is based on minimum explosions size (0, 0, 1) to maximum
explosion size (5, 10, 20)

Formula keeps explosions within a 'sane' range. So while it is possible
to bypass maxcap using this, it will require a LOT of work.

I've done some balance testing, and a halfcap (2,5,10) can be made using
a double bluespace beaker of water and potassium. A (3,7,14) can be made
using black powder, and the largest bluespace grenade explosion can be
made using nitroglycerine, at (6, 12, 24) which is only slightly larger
than maxcap.

You can check out https://www.desmos.com/calculator/pgfz0gqqxf to see
how the explosive power affects range. T is 'units of explosion' and P
is a multiplier. Multipliers for explosive reagents are: water/potass =
1/10, black powder/meth = 1/6, nitroglycerin = 1/2.

* Clarity Changes

Renames dynamic explosion proc for clarity.

Makes dyn_x explosions scaleable with DYN_EX_SCALE variable.

Adds debug dyn_x verbs, and a dyn_x drop_bomb proc to fun admin verbs.

* Adjusts formula

better efficiency and readability.

Adds debug proc for changing explosion scale.

Adds a comment containing common power/explosion sizes.

* oops
2016-09-11 20:46:26 +12:00
Remie Richards 8dd507995a Fixes conflicts, dang it people if(src != user.l_hand && src != user.r_hand) is shit code, shiiiiiiiiiiit. 2016-09-10 20:42:34 +01:00
Remie Richards c50fa5729c Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work 2016-09-10 20:28:23 +01:00
Joan Lung fbe2430ff8 Moves all beam icon states to beams.dmi 2016-09-10 13:09:44 -04:00
Cheridan 94bb371f30 Merge pull request #20402 from ChangelingRain/iwasabillionlittlepiecestilyoupulledmeintofocusastronomyinreverseitwasmewhowasdiscovered
Makes cult structures destructible and readds them
2016-09-10 11:43:59 -05:00
Joan Lung 6de788edf8 Merge pull request #20394 from MrStonedOne/blackmagic
[READY]Makes /client/s a child of /datums/
2016-09-09 14:18:45 -04:00
Joan Lung 5bdfd1665f Merge pull request #20328 from Ergovisavi/bring_colossus_back_2016
New colossus loot, the "Anomalous Crystal"
2016-09-08 22:38:50 -04:00
Joan Lung b245319979 Adds some very fancy tables (#20388)
* Adds some very fancy tables

* even fancierer

* smoothing sprites are like a jigsaw puzzle for assholes
2016-09-09 14:09:16 +12:00
MrStonedOne 0bf4641f50 clients now qdelete. 2016-09-08 08:05:51 -07:00
Joan Lung d8e804ac9a ah, of course 2016-09-08 10:18:41 -04:00
Joan Lung eec5ca0823 that which is done is done 2016-09-08 10:13:13 -04:00
Joan Lung d9e96145a4 Makes cult structures destructible and readds them 2016-09-08 09:54:01 -04:00
yackemflam a30380b5d4 Metaops box set 2: Deleting a branch like a dumbass (#20365)
* Update uplink_kits.dm

* Fuck you too return

* SPACES

* something something is now gone
2016-09-08 17:51:32 +12:00
Ergovisavi 4e4f091905 Merge branch 'master' of https://github.com/tgstation/-tg-station into bring_colossus_back_2016 2016-09-07 01:08:58 -07:00
Ergovisavi 8605809c57 New colossus loot, the "Anomolous Crystal" 2016-09-07 00:58:15 -07:00
oranges ec3ce80589 Merge pull request #20359 from pubby/ingredients
Modernize ingredient boxes
2016-09-07 17:13:41 +12:00
oranges abd8d5187f Merge pull request #20329 from ChangelingRain/justanothertimeimcaughtinsideveryopeneyeholdingontightlytothesidesneverquitelearningwhy
Tweaks smoke and foam layers
2016-09-07 09:58:18 +12:00
Cheridan f3bd39c00d Merge pull request #20343 from lzimann/prod
Stunprods no longer go into backpacks
2016-09-06 15:57:59 -05:00
pubby 9f3e1fa9df Modernize ingredient boxes 2016-09-05 21:05:47 -05:00
Impisi 6b0d8d8cee Increases the odds of the receiver dropping. (#20322) 2016-09-05 16:42:03 -05:00
Lzimann f0af0a59b6 Stunprods no longer go into backpacks 2016-09-05 15:47:10 -03:00
Joan Lung fb9f2a6bb5 Tweaks smoke and foam layers 2016-09-04 17:57:29 -04:00
oranges aa4fc60434 Merge pull request #20291 from jughu/Mission-oxy
Guarantees a breath mask in oxygen lockers
2016-09-05 08:41:05 +12:00
Cheridan 5304510121 Merge pull request #20303 from ChangelingRain/shootmedownofcourseimthesinfuloneherebutnowivefoundareasontofeelnofear
Bubblegum's charge now goes the full distance to the target
2016-09-04 13:38:25 -05:00
oranges 66fe39d1a6 Merge pull request #20279 from A-t48/fix-radiation
Radiation storms no longer spam "Your armor softened the blow.", and radiation messages are now more consistant.
2016-09-04 09:47:12 +12:00
oranges 467987e555 Merge pull request #20273 from Ergovisavi/twohanded_fixer_upper
Fixes #19982
2016-09-04 09:46:22 +12:00
Shadowlight213 4a2242b505 Fixes division by zero with gang spraycans (#20263)
Fixes list index out of bounds runtime in VV
2016-09-03 22:28:32 +02:00
Joan Lung 246c6cf5d6 'insert horrifying roar here' 2016-09-03 14:30:32 -04:00
Cheridan eb59eb95a0 Merge pull request #20274 from Ergovisavi/purification_in_progress
Fixes #20271
2016-09-03 13:00:49 -05:00
Joan Lung 266bacf4c8 Bubblegum now charges past its target's location 2016-09-03 12:09:08 -04:00
Remie Richards 09fee94db5 Second round of fixes:
- Fixed+Future proofed Mutant Parts Sprites
- Fixed Lesser Summon Guns activating the wrong hand
- Fixes stacks merge()ing with and consuming themselves
2016-09-03 11:40:21 +01:00
jughu a568fb9632 fixes the emergency locker 2016-09-03 01:07:41 +02:00
Remie Richards aa7ae7dc38 Fixes cloth from cutting bedsheets ending up INSIDE THE USER (#20286) 2016-09-02 12:40:16 -05:00