Commit Graph

18416 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
45d0afb957 Merge pull request #7522 from nik707/armorynerfs
Nerfs the starting armory
2018-09-06 14:19:33 -04:00
deathride58
f2978d542e Merge pull request #7532 from Trilbyspaceclone/patch-20
Fixing placement and nerfing of Adv Illegal node
2018-09-06 13:33:48 -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
CitadelStationBot
df1018949d Automatic changelog generation for PR #7516 [ci skip] 2018-09-06 12:31:40 -05:00
deathride58
bb359e78d4 Merge pull request #7516 from izzyinbox/electrostim-circuit-part
Adds electro-stimulation integrated circuit part
2018-09-06 13:31:38 -04:00
kevinz000
0e0928df26 Merge branch 'master' into fusion_2 2018-09-03 11:17:45 -07:00
CitadelStationBot
22e3211f44 Automatic changelog generation for PR #7527 [ci skip] 2018-09-03 12:49:48 -05:00
deathride58
0bb4cec65d Merge pull request #7527 from Poojawa/we_goin_do_what_they_say_cant_be_done
Fixes some missing magmag mag icons
2018-09-03 13:49:46 -04:00
CitadelStationBot
a7efb2664f Automatic changelog generation for PR #7497 [ci skip] 2018-09-03 12:49:17 -05: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
CitadelStationBot
5425f02612 Automatic changelog generation for PR #7517 [ci skip] 2018-09-03 12:47:01 -05:00
deathride58
af97633db5 Merge pull request #7517 from Poojawa/rusty_vore
Forces Vore prefs to use rust_g
2018-09-03 13:46:59 -04:00
CitadelStationBot
08efaeda52 Automatic changelog generation for PR #7518 [ci skip] 2018-09-03 12:44:18 -05: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
deathride58
75bddc63d6 Merge pull request #7524 from nik707/pubby-changes
adds missing shutters to pubby
2018-09-03 13:44:01 -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
0ea74e0198 LETS GOOO 2018-09-03 10:39:54 -07:00
kevinz000
e10c477847 Stuff 2018-09-03 10:36:44 -07:00
kevinz000
2bf5e6af58 Initial Commit 2018-09-03 10:35:47 -07:00
izzy
14be1a02d9 adds better chat messages and sound, lowers power draw 2018-09-03 11:52:04 -05:00
Trilbyspaceclone
9b30150571 Fixing placement and nerfing of Adv Illegal node 2018-09-03 02:32:04 -04: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
nik707
31215064ab fixes me being retarded 2018-09-01 18:42:04 -05:00
CitadelStationBot
a8a6bcd23e Automatic changelog generation for PR #7512 [ci skip] 2018-09-01 05:11:26 -05:00
deathride58
779094a37d Merge pull request #7512 from Poojawa/insult-everything
Adds *insult
2018-09-01 06:11:25 -04:00
CitadelStationBot
147089a284 Automatic changelog generation for PR #7511 [ci skip] 2018-09-01 05:11:14 -05:00
deathride58
fe7b4d888e Merge pull request #7511 from Poojawa/patch-1
Updates IC issue message
2018-09-01 06:11:12 -04:00
CitadelStationBot
a7766d63f6 Automatic changelog generation for PR #7503 [ci skip] 2018-09-01 05:10:45 -05:00
deathride58
c115c9dd96 Merge pull request #7503 from nik707/omega-changes
adds toxins to omega
2018-09-01 06:10:43 -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
Poojawa
f194190621 Fixes some missing magmag mag icons 2018-09-01 03:52:24 -05: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
CitadelStationBot
b08b05fafb Automatic changelog generation for PR #7513 [ci skip] 2018-08-31 14:41:39 -05:00
nik707
6e087876e5 makes atmos more secure (#7513) 2018-08-31 12:41:37 -07:00
nik707
797ab5ea86 fixes shezzas ree 2018-08-31 14:15:07 -05:00
CitadelStationBot
4649e8403c Automatic changelog generation for PR #7521 [ci skip] 2018-08-31 14:13:52 -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
nik707
8d0b2966b8 changes starting armory loadout 2018-08-31 11:17:08 -05: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
Poojawa
3ffdfb5bee Forces Vore prefs to use rust_g
This probably fixes vore specific prefs breaking.
2018-08-31 02:46:55 -05:00