Commit Graph

2150 Commits

Author SHA1 Message Date
fleure
b6467378a2 Merge pull request #2304 from Giacom/emagged_destroy_mmi
Emagged Cyborgs, when destroyed via the Robotics Console, will not only have a large explosion but their MMI will die with them.
2014-01-14 10:34:46 -08:00
Aranclanos
8a56589e3e Merge pull request #2292 from sirbayer/srsbsns-determinism
Remove RNG from armor
2014-01-14 05:01:24 -08:00
fleure
62e4dbaf43 Merge pull request #2336 from Tenebrosity/deadmonkeyslimespawn
Fixes map corpse spawn bugs and expands on spawning corpses on the map
2014-01-14 03:16:01 -08:00
Cheridan
a3760dfba1 Merge pull request #2311 from fleure/spider
Added spider meat, meals, and butchering
2014-01-13 14:21:20 -08:00
fleure
ff70b47100 Merge pull request #2318 from Giacom/killing_me_softly
Tidied up the robotics computer code.
2014-01-13 12:11:56 -08:00
Giacom
bb8f5e928f Merge pull request #2334 from VistaPOWA/syndieborg_emergency_fixes
Syndicate Borg emergency fixes (please merge and push to server quick before some shitler fucks over the entire op team just because lellaws)
2014-01-13 12:07:39 -08:00
fleure
5766aec2aa Merge pull request #2328 from Incoming5643/GlassCeiling
[Tumblr] Sausage Party Reduction
2014-01-13 01:57:19 -08:00
Cheridan
6eeb8149d8 Merge pull request #2306 from hornygranny/alienspit
Code by Giacom. Changes alien neurotoxin spit to dumbfire.
2014-01-12 23:42:36 -08:00
Jesus Hussein Chris
68a6131c22 Fixes bugs that prevent spawning dead slimes and dead monkeys before roundstart. 2014-01-13 12:38:31 +13:00
VistaPOWA
0a9bc1ba13 Syndicate Borg emergency fixes
-Syndicate Borgs will no longer synch to AI
-Syndicate Borgs can no longer emag themselves
-Syndicate Borgs will get the proper faction assigned to them,
preventing viscerators from tearing them apart.
2014-01-12 23:20:57 +01:00
Giacom
45d05c7866 Merge pull request #2321 from dumpdavidson/empfix
Fixes EMPs not working on humans.
2014-01-12 13:17:16 -08:00
Giacom
467c784580 Merge pull request #2303 from Bobylein/fixReviveOxyloss
Fixed #1605 oxyloss from suicide after admin revive.
2014-01-12 05:38:43 -08:00
Giacom
6dc7736933 Merge pull request #2244 from VistaPOWA/syndieborgs
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
Incoming
f993585486 [tumblr approved] Sausage Party Reduction
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.

The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).

Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.

This does NOT effect admin summoned unknown humans, those are all still male.
2014-01-12 04:33:45 -05:00
Cheridan
d2a92b3063 Merge pull request #2260 from Giacom/recycler_emag
[MAP] Re-added the recycler's emag functionality and changed it so that it does massive brute damage and eats the person's equipped items
2014-01-11 12:27:13 -08:00
dumpdavidson
8f49eee681 Fixes EMPs not working on humans. 2014-01-11 20:30:59 +01:00
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
VistaPOWA
0afe5c982d merging upstream master into local repo 2014-01-11 17:14:48 +01:00
Aranclanos
baa86c8819 Merge pull request #2305 from Giacom/removed_set_background
Disabled the game using "set background" by making all instances of it use a define
2014-01-11 08:14:15 -08:00
Giacomand
7621973743 Tidied up the robotics computer code.
Removed exploits, such as being able to keep the input menu open to blow up borgs when you want.
Removed the obsolete global killswitch.
2014-01-11 16:12:18 +00:00
Giacom
03eea5642c Merge pull request #2257 from errorage/2014_01_06_borg_module_ui_update
Cyborg module selection UI update
2014-01-11 04:33:03 -08:00
fleure
aa8b5c8431 Added spider butchery 2014-01-11 01:36:26 +00:00
Hornygranny
92550c0240 Removed extra tab breaking compile 2014-01-10 12:38:44 -08:00
Hornygranny
ee072e6e55 Changed neurotoxin from a child of energy to a child of bullet 2014-01-10 12:16:00 -08:00
Hornygranny
b9f6c8bfeb Extra indents removed 2014-01-10 12:01:53 -08:00
Hornygranny
4d9715bd1b Replaced spaces with tabs. 2014-01-10 11:50:46 -08:00
Hornygranny
1cb429bb65 Code by Giacom. Changes alien neurotoxin spit to dumbfire. 2014-01-10 11:25:06 -08:00
Giacomand
f1e7637bab Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.

Server owners who want to keep set background enabled can do so by changing the define.
2014-01-10 18:32:28 +00:00
Giacomand
548d27da35 Emagged Cyborgs, when destroyed via the Robotics Console, will not only have a large explosion but their MMI will die with them. This will promote locking down the cyborg, instead, to discover who emagged it via cyborg deconstruction. This commit was brought to you by the feedback thread, which made it happen. 2014-01-10 17:41:16 +00:00
Bobylein
d8a2cd4e42 Fixed #1605 oxyloss from suicide after admin revive. 2014-01-10 17:44:42 +01:00
Giacom
4304107d26 Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
Morgue Changes
2014-01-10 08:19:33 -08:00
Giacomand
dff02e49eb Merge branch 'master' of https://github.com/tgstation/-tg-station into recycler_emag 2014-01-10 13:21:34 +00:00
Giacomand
5d177d8079 Merge branch 'master' of https://github.com/tgstation/-tg-station into recycler_emag
Conflicts:
	maps/tgstation.2.1.2.dmm

Fixed the map of the mineral machinery input/output bugs.
2014-01-10 13:19:56 +00:00
Aranclanos
203264b124 Merge pull request #2268 from Giacom/last_breath
While in critical you can whisper your final breath, it will result in you immediately dying afterwards, like in the movies!
2014-01-10 05:15:54 -08:00
Giacomand
3626454719 The final whispering uses succumb, which will log their will to die.
All living mobs can now use InCritical(), humans override it.
2014-01-10 12:35:34 +00:00
Aranclanos
3993fbe9b5 Merge pull request #2288 from ManeaterMildred/WHYISRUNTIMEORANGEWHENDEADOHGOD
Fixed the highly important bug that made Runtime orange when dead.
2014-01-10 01:49:38 -08:00
sirbayer
ef7e3258ae Rads finally work. War never changes. 2014-01-08 16:32:35 -08:00
Balrog
98f0e4447c Fixed typo in augmented limb weld message 2014-01-08 17:14:57 -05:00
ManeaterMildred
c29b3fcb52 Fixed the highly important bug that made Runtime orange when dead. 2014-01-08 20:53:08 +01:00
Giacomand
ddb52452a1 Final whispers will use the Elipses proc for extra tension.
The Elipses proc got a new argument which disables replacing words with ..., and instead just adds them.
2014-01-08 18:50:38 +00:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
sirbayer
7a77b4088c Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-determinism 2014-01-07 15:33:41 -08:00
sirbayer
6f0447ffa2 More armor touchups. I think I found all the relevant calls, but... mob code. 2014-01-07 15:27:30 -08:00
Robson Richards
e83928a6ac Span classes 2014-01-07 21:12:16 +00:00
Cheridan
b2108a98ac Merge pull request #2246 from Giacom/followme
Made the ghost follow verb less buggy.
2014-01-07 08:54:00 -08:00
Giacom
7cb6fcb5dc Merge pull request #2243 from Cheridan/Ninja
Ninja Death Tweak
2014-01-07 06:34:35 -08:00
ChuckTheSheep
5eb6491c0c Whoops 2014-01-06 21:27:50 -05:00
ChuckTheSheep
676dc5269a Moved Login/Logout to their defined files 2014-01-06 21:25:10 -05:00
sirbayer
b39dcc949c It works for humans! 2014-01-06 17:54:14 -08:00
Giacomand
7551dd38a8 Changed "his" to "their" 2014-01-06 23:24:47 +00:00