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
56bdb36058
Automatic changelog generation for PR #9942 [ci skip]
2019-11-25 06:39:22 -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
e4dce88761
Automatic changelog generation for PR #9922 [ci skip]
2019-11-24 17:31:17 -06: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
453bb6ca32
Automatic changelog generation for PR #9867 [ci skip]
2019-11-24 16:31:05 -06:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
315082fc91
Automatic changelog generation for PR #9902 [ci skip]
2019-11-24 16:30:45 -06: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
18e7e85e87
Automatic changelog generation for PR #9907 [ci skip]
2019-11-24 14:01:39 -06:00
7481661182
Merge pull request #9907 from Putnam3145/midround-Vr-fix
...
[DYNAMIC] Prevents VR mobs from being midround antags.
2019-11-24 20:01:36 +00:00
6a59cc1c99
Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle.
2019-11-24 10:14:16 +01:00
63e96a1402
Automatic changelog generation for PR #9874 [ci skip]
2019-11-23 12:49:35 -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
40d787133d
Automatic changelog generation for PR #9891 [ci skip]
2019-11-23 12:46:30 -06:00
aba39f0b36
Merge pull request #9891 from Putnam3145/dynamic-traitor-fix
...
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
2019-11-23 11:46:28 -07:00
589055628a
Automatic changelog generation for PR #9881 [ci skip]
2019-11-23 12:46:00 -06:00
f28a6feb5f
Merge pull request #9881 from Putnam3145/persistent-dynamic-weights
...
Allows extended voting on dynamic if recent rounds too chaotic
2019-11-23 11:45:58 -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
0700b050e1
Automatic changelog generation for PR #9909 [ci skip]
2019-11-23 12:44:54 -06:00
f88ed98ee4
Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert
...
Anthromorphic Insect Revert
2019-11-23 11:44:52 -07:00
6b19420a83
Automatic changelog generation for PR #9749 [ci skip]
2019-11-23 12:42:40 -06:00
75510d8da9
Merge pull request #9749 from Trilbyspaceclone/patch-238
...
What do you mean I cant hold the armory on my back? -BOH nerf
2019-11-23 11:42:37 -07:00
c8235def34
Automatic changelog generation for PR #9864 [ci skip]
2019-11-23 12:39:38 -06: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
a69b4b4916
removes creep
2019-11-23 02:28:31 -05:00
c8fe354e91
Automatic changelog generation for PR #9898 [ci skip]
2019-11-22 23:52:46 -06:00
e954cec58c
Merge pull request #9898 from Ghommie/Ghommie-cit387
...
Dreamchecker compatibility changes, part 3.
2019-11-23 05:52:44 +00:00
88d126794c
Automatic changelog generation for PR #9896 [ci skip]
2019-11-22 23:52:13 -06:00
592dcdb6fd
Merge pull request #9896 from Ghommie/Ghommie-cit386
...
Fixing cyborg camera interaction for real
2019-11-23 05:52:11 +00:00
028fa518e4
Merge pull request #9879 from Ghommie/Ghommie-cit383
...
Unmodularize closets.
2019-11-23 05:39:33 +00:00
037b278e9e
Merge pull request #9918 from Ghommie/Ghommie-cit384
...
[S] Makes it compile.
2019-11-22 18:14:41 -08:00
77800cf720
Oh yea it's a list
2019-11-23 03:02:29 +01:00
2d1edf661b
Fixes travis.
2019-11-23 02:58:03 +01:00
ea4fdf727b
Merge pull request #9917 from Ghommie/Ghommie-cit384
...
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
2019-11-22 17:06:50 -08:00
82d97ff4a7
This way is better
2019-11-23 01:51:31 +01:00
24c93d9df6
[S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad.
2019-11-23 01:46:59 +01:00
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
0c76e9a6d0
Automatic changelog generation for PR #9886 [ci skip]
2019-11-22 17:48:30 -06:00
6145cd0d96
Merge pull request #9886 from Ghommie/Ghommie-cit384
...
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
404d202f2b
Automatic changelog generation for PR #9908 [ci skip]
2019-11-22 17:42:56 -06:00
4fbd42995c
Merge pull request #9908 from Ghommie/Ghommie-cit389
...
Little APC overlays tweak. Removing rogue pixels from the energy gun.
2019-11-22 15:42:54 -08:00
b7f7342e43
Merge pull request #9900 from Ghommie/Ghommie-cit388
...
fixing a get_idcard runtime. or The betrayal of the ?. operator
2019-11-22 15:41:52 -08:00
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
61299fee42
ready for review/testing
2019-11-22 15:32:09 -05:00
3544885b73
reverts fermis changes, woops.
2019-11-22 15:26:20 -05:00
kevinz000