Commit Graph

2954 Commits

Author SHA1 Message Date
Firecage 41b1b7dee8 Adds a check to prevent a future ranged message + fixed the message 2015-05-07 23:55:26 +02:00
Firecage 3e540dafdc Adds D4 to the HARDFEET mix. 2015-05-07 18:43:50 +02:00
Cheridan d28cd28426 Merge pull request #9315 from kingofkosmos/attackmsgfix
Removes unnecessary attack-messages
2015-05-06 22:34:30 -05:00
oranges 58c460a361 Fork eating no longer requires mouth zone sel
Instead, if there is a fork load you will simply eat the fork load.
2015-05-07 15:13:06 +12:00
Cheridan 46b2fe33af Merge pull request #9291 from Ikarrus/gangmind
Gang Update
2015-05-06 10:04:26 -05:00
Jordie0608 f85b3735bd group of fixes 2015-05-07 00:40:26 +10:00
Firecage cd92d28b0b New welding tools sprites 2015-05-06 13:38:06 +02:00
Firecage 0ebbc811ac Fixes experimental welding tool 2015-05-05 23:44:46 +02:00
Firecage 8e79448c11 New sprites and name 2015-05-05 22:30:48 +02:00
Firecage c0c2c8b097 cleanable #define 2015-05-05 18:51:44 +02:00
Firecage 522e77752f Removes the ability to clean Overlays 2015-05-05 17:36:51 +02:00
Jordie0608 e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10:00
xxalpha 96ab44536d Fixed smoking pipe messages. Fixed emptying empty pipes.
Improved check.
2015-05-04 22:34:08 +01:00
Cheridan dfaf90c79e Merge pull request #9264 from phil235/BundleFix6
a group of fixes.
2015-05-04 09:41:01 -05:00
Cheridan 191e011c14 Merge pull request #9272 from phil235/BundleFix7
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
Cheridan 78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
kingofkosmos 8c1f6b1644 Mop span fix. 2015-05-04 05:57:31 +03:00
Ikarrus e4079cf923 Loyalty Implants and Gangsters
- Experiment: Loyalty implants will no longer survive deconverting a gangster. Security now needs to use two of them if they want the permanent effects: The first to deconvert them, and the second to make them loyal.
2015-05-03 19:36:13 -06:00
Xhuis ce49f52405 Lowers charge time 2015-05-02 21:27:54 -04:00
Xhuis 08053c0235 Makes the emagged defib more worthwhile 2015-05-02 14:17:05 -04:00
Jordie d1f55ec69a Merge pull request #9203 from Boggart/RpdUiFix
Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes.
2015-05-02 23:58:55 +10:00
phil235 be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
phil235 4a8e168ff3 - admin revive clears addiction list. 8894
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
Xhuis bb54a75d58 Fixes overlays 2015-04-30 20:59:50 -04:00
Xhuis 37d631ca57 Fixes conflicts 2015-04-30 20:40:09 -04:00
Xhuis a8222d9c50 Merge remote-tracking branch 'remotes/upstream/master' into cannons 2015-04-30 18:52:27 -04:00
Xhuis 577c68208a Adds sprites and does some polishing 2015-04-30 18:51:03 -04:00
Ikarrus 0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Cheridan 64b5f8540c Merge pull request #9164 from Fayrik/TheNanoing
The Nanoing (Part One: Atmospherics)
2015-04-29 09:38:56 -05:00
Cheridan 36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
phil235 9b90645cec Merge pull request #9199 from TheVekter/buggate2015
Buggate 2015 PART 1: Slimes, drinks, and more!
2015-04-28 22:01:13 +02:00
phil235 e846b9c21d Merge pull request #9195 from TheVekter/stunofholding
No longer able to BoH bomb while stunned
2015-04-28 21:57:07 +02:00
Remie Richards fca3c0bdb5 Adds Plasmamen! Adds the ability for species to breathe other gases! 2015-04-28 20:48:14 +01:00
Jordie 877e2e8f56 Merge pull request #9176 from JJRcop/TEAenhancement
TED and Chronosuit tweaks
2015-04-28 23:49:40 +10:00
Jordie ba0f89b7f1 Merge pull request #9186 from phil235/AutoDrobeSupplyFix
Autodrobe and cult construct bugfixes
2015-04-28 23:49:20 +10:00
Jordie 641db847cc Merge pull request #9133 from phil235/ClownNamePreferences
Changes clown/mime naming to use preferences.
2015-04-28 23:45:52 +10:00
phil235 0eb80a8607 Makes the standard kitchen knife fit inside your pocket. 2015-04-28 00:36:39 +02:00
phil235 752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
Boggart e474a7b084 Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes. 2015-04-27 13:48:36 -06:00
Boggart 21b148d1d3 Makes ghosting after someone defibs you cause the process to fail by checking just before the revive. 2015-04-27 13:04:25 -06:00
TheVekter edd3daab24 Fixes #9066, removes description on Noslips 2015-04-27 14:03:51 -05:00
Cheridan 98e70f8d7a Merge pull request #9166 from Xhuis/into_the_morgue_with_you
Changes timing of defibrillator message to target ghost
2015-04-27 09:22:38 -05:00
Ikarrus 671bee5027 Centcom Response Team Variations
- The button is now labelled "Make Centcom Response Team"
- Added different response teams of varying strength, to give admins more options than balls-to-the-walls all the time
- Code Green: Centcom Official
- Code Blue: Light ERT - No access to lockers or admin weapons
- Code Amber: Full ERT - Access to lockers, but not admin weapons
- Code Red: Elite ERT - What we have now.
- Code Delta: Deathsquad
- Removed Make Deathsquad button as it's all collapsed into this one button now
2015-04-27 01:08:47 -06:00
TheVekter b6191925bd Fixes #9173 2015-04-26 17:59:05 -05:00
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
Cheridan 6bce2db70d Merge pull request #9159 from Ikarrus/gang5
Gang Update 5
2015-04-26 14:29:50 -05:00
phil235 9e94f56103 Fixes Autodrobe not having any contraband/deluxe items in stock. Adding a warning to prevent future bug.
Fixes dropped resuply canisters having most charges go in a single canister (and going above the initial charge amount).
Fixes exploit with cult constructs creation.
2015-04-26 19:23:22 +02:00
JJRcop febebbd4e3 TED and Chronosuit tweaks
- TED time to kill has been halved
- TED now continually warps you back if you manage to escape, instead of killing you
- TED field is no longer dense
- Chronosuit now does not carry items with you if they are outside the suit, which is the belt, back, and hands.
  \ The TED is an exception
2015-04-26 02:59:11 -04:00
Xhuis a64c792271 Removes particle cannon 2015-04-25 23:12:39 -04:00
Xhuis 0e63f6da8e Fixes defibrillator message 2015-04-25 19:56:14 -04:00