94ef52e1cd
Adds new nuke toy, plays nuke sound when attack_self'd
...
Cooldown of 5 minutes
2014-01-06 16:46:12 -05:00
a219896082
Merge pull request #2241 from ChuckTheSheep/explosiveoptimization
...
Explosion Optimizations
2014-01-06 13:07:05 -08:00
c50255107a
Gives janitor service headset
2014-01-06 18:51:22 +00:00
333d0ed045
Reduced watertank slowdown slightly
2014-01-06 18:26:06 +00:00
bfcd050b77
Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion.
2014-01-06 12:17:07 +01:00
233a5b3b9b
Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs.
2014-01-06 06:34:17 -03:00
e97ce3edfa
Moved on_login() now named on_log()
2014-01-05 20:49:36 -05:00
072b78876f
Merge branch 'Morgue-Changes' of https://github.com/ChuckTheSheep/-tg-station into Morgue-Changes
2014-01-05 20:36:10 -05:00
5cda0c140e
Forgot Crematorium Changes - Whoops
2014-01-05 20:35:57 -05:00
74f2edcb56
Makes the borg spawner and the contract a subtype of antag_spawner
2014-01-05 21:32:43 +01:00
2dcde243f3
Made the teleporter refundable
...
Also fixes a missing return
2014-01-05 17:29:34 +01:00
3c84e37160
Merge pull request #2235 from AndroidSFV/fix2221
...
Resolves #2221
2014-01-05 06:52:47 -08:00
bf9fa21ddc
Merge pull request #2149 from Miauw62/kittens
...
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
e71314d4eb
Merge pull request #2199 from Perakp/buckleFix
...
Buckle fix
2014-01-04 19:51:59 -08:00
68afbbcc18
move along people, nothing to see here
2014-01-05 03:35:17 +01:00
fd34cea8ef
fixes the merging failure
...
hopefully that's it
2014-01-05 03:32:10 +01:00
d1eb240c33
Whoops
2014-01-04 21:22:31 -05:00
9bff642d14
Genocide of the Colons
2014-01-04 21:21:42 -05:00
443d6e2d9e
[MAP] Adds Syndicate Borgs
...
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack
All weapons use 100 charge per shot.
2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
b3635a2935
small fixes
2014-01-04 20:03:22 -05:00
f03d2be397
Morgue Changes
...
Crematorium lights up when cooking.
Morgue slabs change light color depending on what is inside.
Red = dead body, orange = no body but items, green = client connected
body.
Updates when open or closed, and when ghosts/re-enters body inside.
2014-01-04 19:50:13 -05:00
e71f98bbb8
Explosion Optimizations
...
Implements a trange that internally checks only turfs and thus less
intensive.
2014-01-04 19:29:17 -05:00
fe6f217d6f
Adds logging to emagged borgs using their stun arm.
2014-01-04 04:00:16 -06:00
61ed6a5e15
Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
537b6ddba0
Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
...
Removes the gag ball.
2014-01-03 04:19:29 -08:00
09da906881
Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
...
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
3a11af405c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
...
Conflicts:
code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
1e3f2c37a6
Removes the gag ball.
2014-01-01 23:43:01 -03:00
6c644f4652
Merge pull request #2185 from Cluwnes/itspersonnell
...
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
ac9228bae1
Added an else message to make it clear you can't unbuckle while buckled.
...
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00
be0f52b623
Fixed bruisepacks not working
2013-12-31 17:06:34 +00:00
4f6eba7f6a
A proper fix for unbuckling while buckled.
2013-12-31 10:25:12 +02:00
210a4c4d58
Now you can't unbuckle someone if you are buckled yourself.
...
This affects shuttlegriff and alien nesting the most.
2013-12-31 09:48:42 +02:00
f4542ee258
Scattershot ho!
2013-12-30 20:43:10 -08:00
b3d37e1d0a
Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.
2013-12-31 16:50:17 +13:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
e4b251a488
Adds different radio frequency colours for engineering, security, medical, service and supply.
2013-12-30 20:09:35 +13:00
e52a838284
Sprite Changes on request from Nienhaus
2013-12-29 20:46:37 -05:00
a348534ab1
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
2013-12-29 15:54:50 -08:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
53bfd06609
Fixes #2180 - Augmented limb healing issues
2013-12-29 16:12:32 +00:00
92636bbe01
Merge pull request #2168 from fleure/toolbox
...
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
2482fd0702
Makes cards pocketable.
...
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
f1376608eb
Added kittens and Proc, sprites by Nienhaus.
2013-12-27 15:44:40 +01:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
ef25332511
Merge pull request #2125 from Miauw62/ifitfeelsright
...
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
46222226e1
adds the uniform to the RDs locker, and updates the sprites.
2013-12-24 13:11:41 -05:00
758ca4f81c
Added a failsafe, default_laws is now a config option.
2013-12-23 13:10:04 +01:00
JJRcop
Giacom
Fleure
errorage
Aranclanos
ChuckTheSheep
VistaPOWA
Cheridan
AndroidSFV
Miauw
Perakp
sirbayer
Tenebrosity
Rumia29
Cluwnes Honk
Robson Richards
Rockdtben