46c02af86e
Merge pull request #9948 from Ghommie/Ghommie-cit393
...
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
74baa00634
Ports " #44787 "
2019-11-28 19:37:46 +01:00
09897b4ece
Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
...
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
60b8688674
Ports "Fixes transit tube barricade spam"
2019-11-28 07:10:00 +01:00
0ad89bd9de
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
2019-11-28 05:34:56 +01:00
efcf79aab0
teachin' 🅱️ how to swim
2019-11-28 02:32:43 +01:00
13b9158a44
Ports "Plasmamen get plasma in their box"
2019-11-28 02:30:03 +01:00
dc1c17226d
Merge branch 'master' into HeadCorgi
2019-11-28 08:45:19 +11:00
af0110db40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-11-27 21:16:20 +01:00
f9680130f9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-27 18:48:20 +01:00
4640d8495d
)
2019-11-27 05:14:08 +01:00
1f69679cfb
Ports a few telecomms updates and fixes.
2019-11-27 04:58:05 +01:00
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
d3bce1bbcd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2019-11-27 02:59:08 +01:00
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
e6ecabe54c
Scanner
2019-11-26 23:23:29 +00:00
ca2467ff93
Thingie
2019-11-26 23:14:14 +00:00
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
d6d830b2ec
Morgues no longer go "ammunition depleted"
2019-11-26 22:20:52 +01:00
66d1b88725
Get
2019-11-25 22:23:50 -08:00
1283149fb2
also allowed wallets
2019-11-25 22:22:16 -08:00
c5e6cb8ac0
space
2019-11-26 04:08:10 +00:00
69e0f6836a
Adds a lil message so people don't spend 25 minutes trying everything
2019-11-26 04:05:43 +00:00
4e20f576e6
Merge branch 'master' into xantholne-berets02
2019-11-25 20:16:15 -07: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
281ddf73ba
Ports AI console focus loss fix and fixes an error in my trimline code
...
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
639c07665d
Personal closets can use PDAs/tablets now
2019-11-25 02:00:03 -08:00
d0a5c447ce
and THIS is why you always double check your code
2019-11-24 22:04:05 -08:00
0d58e78779
it's nice for things to compile
2019-11-24 21:54:28 -08:00
4bfc7c262d
minor comment fix
2019-11-24 21:46:15 -08:00
0075037d0f
Makes (most) dynamic rulesets lower weight if recently fired
2019-11-24 17:09:38 -08: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
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
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
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
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
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
6145cd0d96
Merge pull request #9886 from Ghommie/Ghommie-cit384
...
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
a7918717ff
fixes compile errors.
2019-11-22 18:22:53 -05:00
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Lin