Lin
42d8228c75
Merge pull request #9722 from Ghommie/Ghommie-cit320
...
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
Lin
66c6659681
Merge pull request #10160 from Ghommie/Ghommie-cit453
...
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
Ghommie
f945577655
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320
2019-12-18 19:20:38 +01:00
BlackMajor
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
Ghommie
3f06661de5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
2019-12-17 03:34:11 +01:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
kevinz000
ba7a3f5fd2
Merge pull request #9971 from Xantholne/xantholne-christmas01
...
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
BlackMajor
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
Unknown
9bfba1d1d9
Merge branch 'master' into xantholne-christmas01
2019-12-15 16:14:37 -07:00
Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
BlackMajor
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
Unknown
73abc2ae40
Merge branch 'master' into xantholne-christmas01
2019-12-14 17:15:00 -07:00
BlackMajor
2bf35ec81c
Nuclear fist
2019-12-14 02:15:09 +13:00
Ghommie
79328012b0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402
2019-12-13 03:41:22 +01:00
Ghommie
9aeab6c589
amber.
2019-12-12 22:47:04 +01:00
Ghommie
4502d7b795
Ports improved and simplier fire alarms.
2019-12-12 22:44:20 +01:00
Useroth
5e836c51e4
Forgot to track the new files
2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d
First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs.
2019-12-08 14:00:08 +01:00
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +02:00
Useroth
28ddfd29b6
Merge branch 'master' into new-tg-plants
2019-12-07 14:25:38 +01:00
Unknown
825f553a5d
Merge Conflicts
2019-12-06 17:25:31 -07:00
Unknown
97e686cf23
Merge branch 'master' into xantholne-christmas01
2019-12-06 17:21:08 -07:00
Ghommie
723690bab0
Demodularize defib disks and projectiles icons.
2019-12-06 23:07:50 +01:00
Useroth
1158c03ed7
Added bamboo.
2019-12-06 19:00:10 +01:00
kevinz000
e2f9a68c2c
Merge pull request #10049 from Useroth/new-tg-plants
...
Colored fairy grass, because fuck your eyes.
2019-12-05 21:43:24 -07:00
Seris02
0c5a1b900b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
2019-12-05 21:09:38 +08:00
Seris02
2ce79828b8
ratvar coat updated
2019-12-05 20:46:59 +08:00
Useroth
950b884da5
Adds colored fairygrass.
2019-12-05 01:47:42 +01:00
TrilbySpaceClone
b3d778f786
readds
2019-12-03 23:54:24 -05:00
TrilbySpaceClone
e1717bb534
Merge branch 'master' into crow
2019-12-03 23:45:05 -05:00
Seris02
72e5e17c51
ratvarian and narsian winter coats
2019-12-03 18:16:36 +08:00
Lin
99e9c7299e
Merge pull request #10004 from Ghommie/Ghommie-cit414
...
Unmodularizing first aid kits.
2019-12-03 01:30:51 +00:00
Artur
f48d8016d5
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-01 13:51:57 +02:00
Seris02
9afbabb55e
removes cult coat for now, adds coats to places
2019-12-01 05:42:43 +08:00
Seris02
b5f732c838
formal and cc winter coats + start of cult coats
2019-12-01 04:06:03 +08:00
Artur
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
Unknown
e929728666
Merge conflicts
...
can I valid ghom
2019-11-28 23:25:05 -07:00
Unknown
233ca30cd6
Merge branch 'master' into xantholne-christmas01
2019-11-28 23:21:36 -07:00
Ghommie
9b8ed8ca4f
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
2019-11-29 07:14:51 +01:00
kevinz000
521fdec59b
Merge pull request #9960 from Ghommie/Ghommie-cit398
...
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
Unknown
33854e8fd8
Adds a huge amount of Christmas clothes
2019-11-27 20:07:39 -07:00
Ghommie
4a3a7c841a
Removes literally atrocious polka dotted accessories.
2019-11-28 03:54:38 +01:00
Ghommie
a5298dac7e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310
2019-11-27 21:44:56 +01:00
Ghommie
a89eccbac5
Ports custom reagent icecreams, plus some fixes.
2019-11-27 08:16:17 +01:00
kevinz000
2aa0211121
Merge pull request #9906 from Xantholne/xantholne-berets02
...
[Ready] Ports/Adds new berets but I don't break the branch somehow
2019-11-26 19:26:18 -07:00
kevinz000
ccfdb74508
Merge pull request #9882 from FestiveBall/Fersi
...
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
Unknown
65db2b2160
Merge conflicts
2019-11-25 20:19:57 -07:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
Useroth
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
