9a022f21eb
Merge pull request #10245 from r4d6/substationV2
...
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
2019-12-23 18:58:26 +01:00
b909f54ba5
Revert "Revert "Add the option to restrict the Engine that spawn""
...
This reverts commit d851beea16
2019-12-23 10:25:37 -05:00
d851beea16
Revert "Add the option to restrict the Engine that spawn"
...
This reverts commit e3e1f91635
2019-12-23 10:23:55 -05:00
e3e1f91635
Add the option to restrict the Engine that spawn
2019-12-23 10:06:35 -05:00
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
383e09651f
Suggestions
2019-12-21 14:55:37 -05:00
61a702bad5
Merge remote-tracking branch 'upstream/master' into substationV2
2019-12-19 23:51:14 -05:00
dbf3e7d246
Add the landmarks
2019-12-19 15:27:45 -05:00
70e50e57cd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-17 20:21:49 -06:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
59d0376985
finished
2019-12-14 17:31:26 +13:00
1e2a4f606c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-12-08 14:17:00 -06:00
025a7cd79a
more ports
...
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
2019-12-07 03:04:02 -05:00
723690bab0
Demodularize defib disks and projectiles icons.
2019-12-06 23:07:50 +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
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
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
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
ca99a8285c
Merge pull request #9803 from Ghommie/Ghommie-cit350
...
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
8f08e1017e
Merge pull request #9688 from Ghommie/Ghommie-cit306
...
Fixing gibspawner runtimes and improving them, how gruesome...
2019-11-14 15:51:20 -07:00
aa441fba5d
Ports Improved beach away mission.
2019-11-13 22:52:39 +01:00
c5a7c28a1b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-12 16:04:05 +01:00
df051186eb
Merge branch 'master' into abductor-update
2019-11-11 00:08:59 +00:00
4c1eba0d81
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
2019-11-10 23:52:48 +01:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
e02849fab7
double deletion dip sauce, now with 30% more cpu waste.
2019-11-02 19:54:20 +01:00
065fbdf0cb
Fixing gibspawner runtimes, how gruesome...
2019-11-02 19:37:35 +01:00
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
cb74be29ae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
2019-10-25 12:40:50 +02:00
2ae111eaf0
Merge pull request #9587 from Ghommie/Ghommie-cit258
...
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
7b257242c2
bullets won't work...
2019-10-24 10:44:57 +02:00
4c8d7023c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
2019-10-24 09:50:20 +02:00
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
c882c098cc
Porting movespeed modification system updates.
2019-10-23 19:24:34 +02:00
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
ec22088534
Complying with suggestions. Also stops dnr observers from getting ghost role notifications
2019-10-20 09:15:35 +02:00
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
dbcda948fb
Darn thing
2019-10-11 19:56:58 +01:00
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
213bd2fc6b
fixes
2019-09-12 23:35:21 -05:00
Ghom