Commit Graph

4458 Commits

Author SHA1 Message Date
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
xxalpha 832bca822f Fixes world hunger. 2015-04-28 20:13:59 +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 29a56c547d Merge pull request #9150 from AndroidSFV/Carpops
Carp Ops: Team-Building Edition
2015-04-28 23:48:13 +10:00
Jordie 4463bcfec3 Merge pull request #9193 from Ikarrus/gang5.1
Gang Update 5.1
2015-04-28 23:46:27 +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 07afe76f8c Fixes #9098 and #9077. 2015-04-27 01:41:12 -05:00
Cheridan b27f145f81 Merge pull request #9172 from GunHog/NTSL_Fix
Fixes NTSL Artifical Broadcasts
2015-04-26 22:50:53 -05:00
Ikarrus 9e805710ae - Tweaks to instructional text
- Promotion costs reduced to 10, 30, 50 influence each
- changelog
2015-04-26 18:00:35 -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
Ikarrus 4746fe34f5 Gang Update 5.1
I'm quite satisfied in the current state of gang and I feel that I no longer have any more significant changes to make. Gang 5.1 includes primarily minor tweaks.
- Goal reduced back down to 50%
- Boss icon made more obvious. They're now red Gs
- Better descriptions for distributing spraycans and victory conditions
- Lieutenants receive objectives now
- Increased spraycan use to 20
- Poseur tags no longer pick gang B's tag
2015-04-26 16:02:32 -06: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
GunHog 8974fe23fe Fixes NTSL!
Radio transmissions made via NTSL now work again.
Moved the Centcom radio checks from 4 to 5 so it does not override other
things.
2015-04-25 22:31:51 -05: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
Ikarrus a46d79245c Squashed commits. You can see what they do in the first commit/PR desc 2015-04-25 14:05:30 -06:00
phil235 9132838420 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/objects/items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02:00
phil235 2ef588e01d derp 2015-04-25 19:27:20 +02:00
phil235 67a14f4c21 Changed how the bible icon is chosen, it's now done manually by clicking the bible as a chaplain (only work once). 2015-04-25 19:21:32 +02:00
Ikarrus e26695b7db Removed unnecessary check 2015-04-25 02:36:59 -06:00
Ikarrus 452bae9c19 - Capture goal reduced to 60%
- You must be in the territory physically to tag it now. So no more tagging everything from maint.
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.

- Removed solars and shuttles, and the toxins test chamber from valid territory list
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.
- You cannot tag tiles with APCs. No cheating, you maint crawlers.
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing them
2015-04-25 02:14:28 -06:00
Ikarrus 7b02a11dc2 Gang Update 5
###Major Changes###
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.

###Minor Changes###
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing people
2015-04-25 01:20:04 -06:00
Fayrik 80ff5d45d0 Air alarm template still needs a tweak, but it's functional now. 2015-04-25 05:22:00 +01:00
Boggart 077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
Boggart c6a22a98c9 Renames Violin.dm to Instruments.dm in preparation for generalizing the code and to preserve the git history. 2015-04-24 19:12:16 -06:00
AndroidSFV c02fa97221 Merge branch 'master' of https://github.com/tgstation/-tg-station into Carpops 2015-04-24 15:19:11 -05:00
AndroidSFV 97da25eca5 Dehydrated carps inherit factions (minus neutral) from their owner. 2015-04-24 15:18:37 -05:00
kingofkosmos d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
kingofkosmos 761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Cheridan 30d160b1d2 Merge pull request #9112 from Ikarrus/gang4
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
GunHog aa59485a58 Positronic Brains!
-Adds positronic brains
- Fixes a runtime in mechs for pilots without DNA
2015-04-24 09:23:20 -05:00