Commit Graph

8581 Commits

Author SHA1 Message Date
Joan Lung 2d56449f11 Conflict self. 2016-10-24 11:20:21 -04:00
oranges a4412284ac Merge pull request #21119 from Iamgoofball/patch-140
Makes foam less garbage
2016-10-24 22:53:27 +13:00
Cheridan ddb4bad29f Merge pull request #21132 from CyberbossJHCB/SanitizeSafe
Secure storage href sanitization
2016-10-23 22:39:55 -05:00
Joan Lung cf842f0aac Merge pull request #21147 from lzimann/fireaxefix
Fixes axes being placed in the tile instead of inside the cabinet
2016-10-23 19:20:46 -04:00
uraniummeltdown 1635017bb2 Atmos Grenades (#21014)
* adds atmos grenades to game and uplink

* added freon grenade, price is now 12 TC, made var for contents

* price is now 11 TC

* fixes knockout desc
2016-10-24 00:15:51 +13:00
oranges 9a8ca91d59 Merge pull request #21126 from CyberbossJHCB/DontBurnThisWitch
Gloves protect against cheap lighters
2016-10-24 00:11:05 +13:00
Lzimann e34a1c3eb4 Fixes axes being placed in the tile. 2016-10-22 19:19:33 -02:00
Cyberboss 058d1f834f Fixes #20452 2016-10-22 10:28:28 -04:00
Cyberboss 25f31a512e Fixes #11419 2016-10-21 18:45:20 -04:00
NikNakFlak 8a85e7bcae Adds the purple skirt! 2016-10-21 11:42:16 -07:00
Iamgoofball 8c77f30770 Makes foam less garbage
only took me 6 months and phil saying I can't make any new PRs until it's fixed

foam now only divides by 7, and it won't apply the reagent's effects unless the lifetime is a multiple of 7
2016-10-21 10:07:44 -07:00
Screemonster 60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893)
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
2016-10-21 15:30:46 +13:00
Joan Lung 7f89fdf39f The range for combat-y visible messages is now a define (#21077) 2016-10-21 15:20:14 +13:00
Joan Lung 397911eccc Tinkerer's Daemons are now a structure 2016-10-20 17:27:58 -04:00
Joan Lung 57d7c91aff Input-based teleportation paper no longer allows you to abuse the delay in inputting a location (#21059)
* Input-based teleportation paper no longer allows you to abuse the delay in inputting a location

* why do we CARE if we can't move there normally we're fucking teleporting

* Not as restrictive
2016-10-20 12:50:33 +02:00
Cyberboss b0a74281dd Someone call that chick from the italian job because this isn't the Worthington 1000 (#21046) 2016-10-20 12:48:15 +02:00
oranges 4404a01b51 Add logging for spiderlings spawned by botany + refactor spawning code (#21037)
Adds a log with an admin message for when spiderlings are spawned by a
botany user adding mutagen or adminordrazine, it also adds a helper
method for spawning atoms that supports a callback post spawn to
modify variables specific to the atom
2016-10-20 12:46:24 +02:00
Joan Lung 7f08e9c901 Merge pull request #21056 from Tacolizard/patch-7
Adds medals to the captains lockbox
2016-10-19 18:48:34 -04:00
Cheridan bd51c9ad1a Merge pull request #21034 from ChangelingRain/magicbrassbullshit
Things made out of magic ratvarian brass are immune to fire and acid
2016-10-19 13:03:37 -05:00
Cheridan 6801dda2aa Merge pull request #21061 from phil235/cabinetextinguisherderp
fixing a typo
2016-10-19 13:01:13 -05:00
Cheridan 7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
Leo 9cd27d136a Station Charter now keeps the server name in the game's window name after renaming the station (#21030)
* Charter now keeps the server name after renaming the station

* Changes instances of "world.name" to use the proper proc to get the station name.
2016-10-19 16:54:22 +13:00
Cyberboss dfbdbb5482 Fixes speaking being delayed by tcomms (#21020)
* Temporary workaround

* Made the better
2016-10-19 13:37:15 +13:00
phil235 186c02595a fixing a typo 2016-10-19 01:58:15 +02:00
Tacolizard fbe45570a9 Update lockbox.dm 2016-10-18 13:07:22 -07:00
MrPerson 5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
lordpidey 499cb6c7db Minor devil fixes (#20770)
* Replaces OBLIGATION_DRINK with a much more appropriate fiddle reference
Attempting to clone soulsellers no longer works.  Fun things happen if you try.
Fireproof paper no longer becomes unreadable on burning.
Made a generic "Conjure item" spell as a superclass for the summon pitchforks.  These spells summon/unsummon an item directly into your hand.
You can no longer spam ghosts with the infernal revival contract.

* Adds the sprites for the golden violin

* Fixes compile error.

* Small changes for AnturK

* I speel gud.
2016-10-18 08:45:45 +02:00
Joan Lung 4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
phil235 30ca862473 Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
2016-10-17 22:51:57 +02:00
oranges c5e7e0ed2a Merge pull request #21031 from phil235/fix_spaceruin_map_shit
Area fixes
2016-10-18 09:28:35 +13:00
oranges 86a8d8a7f5 Merge pull request #20962 from phil235/hit_message
No more message spam when you witness someone being attacked or shot
2016-10-18 09:17:41 +13:00
oranges 25daa7b5f1 Merge pull request #20992 from swindly/spelling
Fixes various spelling/grammar/punctuation errors
2016-10-18 09:15:32 +13:00
oranges d165c98420 Merge pull request #21018 from Shadowlight213/revert-20774-ClickAss
Revert "Makes drag/drop that dont have any use call click"
2016-10-18 09:14:09 +13:00
TheCarlSaganExpress 4a93709088 The welder can be used to fix the display case and fire axe cabinet. (#20920)
* Fixes #20747.
You may now use your ID to unlock the display case.
Fireaxe cabinet and display case may now be repaired with the welder.

* Welder amount.

* Fire axe welder amount.

* Adds comments to the display case

* Captains display case now requires specops access
2016-10-18 09:08:42 +13:00
oranges d115c7dd10 Merge pull request #20991 from bear1ake/cyborg-stack-1
Fixes for cyborg stack using variant 1 #20521
2016-10-18 09:03:33 +13:00
Joan Lung 9b61e7b638 Things made out of magic ratvarian brass are immune to fire and acid 2016-10-17 15:53:27 -04:00
phil235 5c27f05c41 Fixes runtime when using hand tele and canceling when in the target selection menu. 2016-10-17 21:35:34 +02:00
phil235 19cda8f56b Reorganizes the area folder to be more readable (multiple files instead of a big one with a million areas defined, moving areas that were defined outside the folder back into the folder).
Fixes issue with area power alerts, related to many space ruins using the same area and thus having multiple apcs in the same area with some wanting the area to be powered and some unpowered, leading to the area's power state constantly switching (area/procpoweralert() becoming the second most costly proc on the profile).
I fixed it by giving to many space ruins their own area (mostly those who have an APC).

Making a global list var "teleportbeacons" so we don't have to use "in world" to fing all tracking beacons used by teleporters.
2016-10-17 21:19:31 +02:00
Cheridan 521dbbbabc Merge pull request #21006 from phil235/xenoeggfix
Fixes xenomorph not being able to open their eggs.
2016-10-17 13:48:08 -05:00
Cheridan ffbc6dbdf5 Merge pull request #20993 from erwgd/ReturnRollingPins
Re-add rolling pin to plank recipes
2016-10-17 00:46:40 -05:00
Shadowlight213 18709e5ad7 Revert "Makes drag/drop that dont have any use call click" 2016-10-16 12:41:42 -07:00
phil235 a7a8b11eff Fixes xeno attacking nests instead of unbuckling. You now attack the nest on harm intent and unbuckle on all other intents. 2016-10-16 20:12:51 +02:00
Joan Lung 7371d36b2c Merge pull request #20978 from phil235/StatueShit
Unfuck the statue code.
2016-10-16 12:43:43 -04:00
Joan Lung 1d075c6227 Merge pull request #20976 from phil235/bodybedQoL
Clicking a floor with a bodybag or roller bed now deploys them directly.
2016-10-16 12:42:27 -04:00
phil235 ee14fbc4b8 Fixes xenomorph not being able to open their eggs. 2016-10-16 12:36:42 +02:00
phil235 e74de9b357 Merge branch 'master' of https://github.com/tgstation/-tg-station into damage_fix
# Conflicts:
#	code/modules/mob/living/carbon/carbon_defense.dm
2016-10-16 12:19:48 +02:00
phil235 f6db08af2e Contents_explosion() tweaks (#20934)
* When any object is hit by an explosion, we no longer always call ex_act() on all its contents indiscriminately.
The default contents_explosion() does nothing and it's overriden for certain objects only like storage items, machines with occupants, mechs.

I've also overriden handle_atom_del() for many objects so that any sudden deletion of an object referenced in an object var of its container properly nullifies such references, avoiding potential runtime and updating the container's icon_state (e.g. admin-delete a mixer's beaker and the mixer's sprite updates immediately).

I've tweaked bomb effect on worn clothes, having some armor but not 100% now still protects your clothes somewhat.

Fixes some arguments of ex_act in living/ex_act() and other mobs.

* derp and map fixes.

* dem map fixes, man.

* More work on code that use implants, simplified now that we can use the "implants" carbon var.

* some fixes

* more typos and fixes.
2016-10-16 10:01:37 +13:00
erwgd a2c459fd8a Added rolling pin to plank crafting 2016-10-15 21:01:37 +01:00
swindly 90f410b8ed fixes mispellings and makes grammar gooder 2016-10-15 14:29:14 -04:00
bear1ake e95c7ac465 Fixes for cyborg stack using variant 1 2016-10-16 02:32:16 +09:00