Commit Graph

11414 Commits

Author SHA1 Message Date
kevinz000
abb8fc2627 Update kinetic_crusher.dm 2018-09-06 19:30:50 -07:00
deathride58
6cc7c3cd6b Merge pull request #7533 from Citadel-Station-13/fusion_2
Ports new fusion from /tg/station. Now with extra FUN*! *lethality, lightning, radioactive fallout, and explosions
2018-09-06 14:28:15 -04:00
deathride58
b5566353cf Merge pull request #7531 from nik707/fuckingdronesman
clarifies drone rules when becoming a drone
2018-09-06 13:33:36 -04:00
deathride58
d080154423 Merge pull request #7529 from Trilbyspaceclone/patch-19
Makes slime cores be able to be made into sci points (Once per color type)
2018-09-06 13:33:22 -04:00
kevinz000
0e0928df26 Merge branch 'master' into fusion_2 2018-09-03 11:17:45 -07:00
deathride58
d57db6ba81 Merge pull request #7497 from improvedname/more-nerf
Makes the syndicate suspicous toolbox not be called "suspicous anymore" but just black and red striped instead.
2018-09-03 13:49:15 -04:00
deathride58
c8a3f56af6 Merge pull request #7489 from Citadel-Station-13/nanites
Nanites port
2018-09-03 13:47:28 -04:00
deathride58
d3c116d1a0 Merge pull request #7518 from Poojawa/cit_pref_issues
Fixes Cit_toggles by sanitizing it with less autism
2018-09-03 13:44:16 -04:00
kevinz000
f8a0ac8574 work damnit, work. 2018-09-03 10:43:49 -07:00
deathride58
95548530b3 Merge pull request #7526 from Tupinambis/TheSpareV2
Makes Spare more Accessible for heads (V2 because I forgot to compile the first time haha yes)
2018-09-03 13:43:31 -04:00
kevinz000
e10c477847 Stuff 2018-09-03 10:36:44 -07:00
kevinz000
2bf5e6af58 Initial Commit 2018-09-03 10:35:47 -07:00
Trilbyspaceclone
20eca82aed Re adds in cores, Poojawa is correct here 2018-09-02 19:11:30 -04:00
nik707
3f5b75e435 makes this less misleading 2018-09-02 18:04:13 -05:00
Trilbyspaceclone
c59bac3116 list 2018-09-01 20:39:37 -04:00
Trilbyspaceclone
384d760338 adds oil slime core 2018-09-01 20:27:47 -04:00
Trilbyspaceclone
d3af787938 Fixes core DA and add slime core DA 2018-09-01 20:22:19 -04:00
deathride58
fe7b4d888e Merge pull request #7511 from Poojawa/patch-1
Updates IC issue message
2018-09-01 06:11:12 -04:00
deathride58
60c7c2cda5 Merge pull request #7506 from Citadel-Station-13/kevinz000-patch-2
Clamps flash confusion
2018-09-01 06:09:32 -04:00
Tupinambis
afcf52f5d8 This time it should actually work. I forgot to compile the first because I am an idiot haha yes. 2018-08-31 18:05:10 -05:00
Poojawa
4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
Poojawa
160f981fcc Fixes Defib mount cloning (#7520) 2018-08-31 12:13:23 -07:00
Poojawa
1975c74efb Fixes Cit_toggles by sanitizing it with less autism
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
2018-08-31 03:11:41 -05:00
Nick
fad5d5db83 Update toolbox.dm 2018-08-29 17:49:00 +02:00
Nick
03358c2db6 Update toolbox.dm 2018-08-29 17:48:16 +02:00
Poojawa
6344de3a14 Updates IC issue message 2018-08-28 22:50:34 -05:00
deathride58
4446251a6d nerfs nerve support because lets face it, it's just straight-up cancer 2018-08-28 08:11:09 -04:00
deathride58
69e1cb5aea nerfs disablers, buffs tasers (#7507) 2018-08-28 02:41:01 -07:00
kevinz000
0a39366f1a Update flash.dm 2018-08-27 17:57:05 -07:00
deathride58
778e45a1e9 Merge pull request #7494 from Citadel-Station-13/kevinz000-patch-6
makes cns rebooters useful again
2018-08-26 21:25:42 -04:00
deathride58
0f53432680 Merge pull request #7500 from Citadel-Station-13/kevinz000-patch-7
fixes techweb node default cost being an int instead of a list
2018-08-26 21:25:09 -04:00
deathride58
1e4bcc7af3 Merge pull request #7493 from Citadel-Station-13/kevinz000-patch-2
*FIXES* comms consoles not working after autocall - yes this is a bug
2018-08-26 21:23:23 -04:00
deathride58
7a6f8ef5a3 Merge pull request #7492 from Tupinambis/Flukies
Nuclear Operatives are no longer exclusively human
2018-08-26 21:23:11 -04:00
deathride58
bcb6a495b0 Merge pull request #7490 from Citadel-Station-13/kevinz000-patch-5
allows emagged shuttle purchase requirement but this time it merges into master instead of a broken branch
2018-08-26 21:22:49 -04:00
deathride58
107034d34c Merge pull request #7502 from Citadel-Station-13/kevinz000-patch-8
Makes the code not go "no you" when admins try to note people (NOTE: NOTES ARE STILL BUGGED, this just fixes the worst issue)
2018-08-26 21:21:38 -04:00
kevinz000
e300eb4150 Update sql_message_system.dm 2018-08-25 19:32:13 -07:00
kevinz000
cd13befadb Update _techweb_node.dm 2018-08-25 19:00:13 -07:00
Nick
770cefe387 Update toolbox.dm 2018-08-25 21:33:21 +02:00
kevinz000
2a00fcb51e Update IsBanned.dm 2018-08-25 06:20:29 -07:00
kevinz000
b1f455ccaf Update IsBanned.dm 2018-08-25 06:19:04 -07:00
kevinz000
d5674d9692 Fix + Buff 2018-08-25 04:00:53 -07:00
deathride58
2e5b3b25ce Merge pull request #7485 from Citadel-Station-13/kevinz000-patch-3
goddamnit
2018-08-25 06:17:03 -04:00
kevinz000
0bdf684933 Update augments_internal.dm 2018-08-24 23:28:06 -07:00
kevinz000
c1b3f7afee Update communications.dm 2018-08-23 22:46:59 -07:00
Tupinambis
a4855f14d0 return TRUE 2018-08-23 20:48:55 -05:00
kevinz000
3352a1b839 Fix 2018-08-23 17:04:36 -07:00
kevinz000
f17e741c6e FIX 2018-08-23 16:13:27 -07:00
Tupinambis
750f97444e Nuclear Operatives are now able to be any roundstart species except plasmamen. Snowflakes rejoice. 2018-08-23 18:09:07 -05:00
kevinz000
3b6b583a69 Fix 2018-08-23 13:14:42 -07:00
LetterJay
64498b8099 oops 2018-08-23 11:58:09 -05:00