2f58e4527a
Update clockwork_marauder.dm
2019-11-26 15:47:04 -07:00
0187b88278
Update scripture_applications.dm
2019-11-26 15:40:31 -07:00
0b9ea6c7f0
no pedoing the AI
2019-11-26 19:58:25 +00:00
804ee207e3
Update _status_effects.dm
2019-11-25 22:52:19 -07:00
70ec955ef3
Update _status_effects.dm
2019-11-25 22:47:24 -07:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07:00
495b4b6ddc
Fixes some issues
2019-11-25 20:13:07 -07:00
e686be55c5
prevent glands from spoiling
2019-11-25 21:04:01 -06:00
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
8219d298a5
Merge pull request #9942 from Useroth/new-tg-plants
...
[Hotfix] Fixed the reagents in the new plants.
2019-11-25 04:39:20 -08:00
99300229a1
Fixed the reagents in the new plants.
2019-11-25 13:35:26 +01:00
79a64d9c63
Makes synthtissue a lil easier.
2019-11-25 03:36:39 +00:00
6a4c959b0a
Added more crates.
2019-11-24 19:05:03 -05:00
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
0b60d5e6ef
derp
2019-11-24 17:48:09 -05:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
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
47b5dbeaaa
Merge pull request #9625 from Ghommie/Ghommie-cit277
...
Unmodularize digi/muzzled clothing sprites.
2019-11-25 11:30:31 +13:00
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
6c51f09a82
Make organs no longer contaminable.
2019-11-23 21:14:24 -08:00
99e9c606c0
I dunno what I did but it's fixed... somehow.
2019-11-24 04:03:51 +00:00
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
2501b5c88c
Revert "Revert "Okay""
...
This reverts commit fb2c29caff
2019-11-24 03:04:27 +00:00
3155e3ffb3
Revert "Revert "Removes the random love""
...
This reverts commit ce7e9ac452
2019-11-24 03:04:20 +00:00
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
8ea6618f5d
Revert "ARGH"
...
This reverts commit f0f52ce3f8
2019-11-24 03:01:59 +00:00
cb4bfa65d1
Revert "?"
...
This reverts commit 05d18171e0
2019-11-24 03:01:55 +00:00
1f7e9d8ab5
Revert "please"
...
This reverts commit ac53c26d87
2019-11-24 03:01:51 +00:00
ac53c26d87
please
2019-11-24 02:58:15 +00:00
05d18171e0
?
2019-11-24 02:57:46 +00:00
f0f52ce3f8
ARGH
2019-11-24 02:55:50 +00:00
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
135608551f
Merge remote-tracking branch 'upstream/master'
2019-11-24 02:45:28 +00:00
ce7e9ac452
Revert "Removes the random love"
...
This reverts commit b056d91ea5
2019-11-24 02:45:06 +00:00
fb2c29caff
Revert "Okay"
...
This reverts commit 37ac0ccb66
2019-11-24 02:44:32 +00:00
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
fb4a47d310
Added more items to vendors.
...
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
2019-11-23 15:58:04 -05:00
e19b85c823
change recipe
2019-11-23 12:58:42 -06:00
f0996208a3
Merge pull request #9874 from Ghommie/Ghommie-cit379
...
Honkbot slip and slide fun ride.
2019-11-23 11:49:32 -07:00
be679b97a6
Merge pull request #9885 from Commandersand/cuckcult
...
Makes the brass skewer more ouchie than ouchie~
2019-11-23 11:45:24 -07:00
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
88762c5d89
Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand
...
Able to use Legion Cores in-hand
2019-11-23 11:39:35 -07:00
kevinz000