ffa013af6e
Minor captains closet cleanup.
2019-12-25 03:59:21 +01:00
9e6f0762b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
2019-12-24 22:27:41 +08:00
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
1b9b54b33d
Merge pull request #10267 from Ghommie/Ghommie-cit486
...
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
2019-12-23 00:44:42 -08:00
8bc277d38d
Fills white first aid kits to the brim. Ergo how I was fooled into believing it was a tweak and not a nerf.
2019-12-22 11:40:25 +01: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
9d00072072
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
...
Removes a magicnumber
2019-12-21 15:33:27 +01:00
3738156340
Magic number baaad
2019-12-21 15:16:28 +01:00
ce34bcf2e4
Merge pull request #10012 from Commandersand/INEEDAMEDICBAG
...
Rebalance/port: refactor ported, ointment/brute pack healing nerf but max stack doubled. gauze heals a bit now
2019-12-21 14:34:43 +01:00
7f0ae5dbde
I gotta go fast.
2019-12-21 13:04:27 +01:00
3df8619980
Merge pull request #10141 from Putnam3145/dynamic-statbus
...
Adds a bunch of statbus logging to dynamic
2019-12-21 11:45:44 +01:00
71d0c3e257
Merge pull request #10232 from DeltaFire15/cc-headmessages
...
All heads of staff can now spam CC.
2019-12-21 11:27:04 +01:00
848ad4b39b
Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul
...
Dynamic rulesets that have fired in recent rounds have lower weight
2019-12-21 11:20:24 +01:00
19fc981cc1
Merge pull request #9596 from Linzolle/abductor-update
...
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
a7cda1aea0
Merge pull request #10059 from lolman360/HeadCorgi
...
you can pick up corgis now
2019-12-21 11:05:36 +01:00
9a38612ec4
Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128
...
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
2019-12-20 16:27:47 +01:00
685425ed55
Atomises out the magicnumber change
2019-12-20 15:26:16 +01:00
61a702bad5
Merge remote-tracking branch 'upstream/master' into substationV2
2019-12-19 23:51:14 -05:00
8511c44f0f
Merge pull request #10199 from Ghommie/Ghommie-cit467
...
Fixing and cleaning up the blood bank generator code.
2019-12-19 23:39:17 +00:00
3dc00519fc
Merge pull request #9910 from Ghommie/Ghommie-cit390
...
Unmodularize gamemodes folder.
2019-12-19 23:23:20 +00:00
42d8228c75
Merge pull request #9722 from Ghommie/Ghommie-cit320
...
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
66c6659681
Merge pull request #10160 from Ghommie/Ghommie-cit453
...
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
dbf3e7d246
Add the landmarks
2019-12-19 15:27:45 -05:00
63dd3487b3
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
...
the one where the combat medic kit gets buffed
2019-12-19 14:11:27 -06:00
8aca8b8f25
thank you based ghomtainer (when) 2x how did i not notice this
2019-12-19 04:00:37 -07:00
9436d218b4
thank you based ghomtainer (when)
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-19 03:59:57 -07:00
eee52655ef
Update flashbang.dm
2019-12-19 01:57:28 -07:00
e546a59214
Magic number man bad, also all heads can spam CC now
2019-12-18 19:29:35 +01:00
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
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
7017ab243b
Merge pull request #10216 from Ghommie/Ghommie-cit474
...
Porting a few martial art code updates.
2019-12-17 11:47:19 -08:00
37cfec22aa
Merge pull request #10066 from Sishen1542/aaaaaaaa
...
neovgre qol changes
2019-12-17 11:40:43 -08:00
0adcb900c1
Merge pull request #10155 from Seris02/windowfix
...
adds some distance checks to some things
2019-12-17 11:34:13 -08:00
10f0fa6868
Merge pull request #10203 from DeltaFire15/mechaccess
...
Nukies and deathsquaddies can now finally fix their mechs internal fires
2019-12-17 11:32:56 -08:00
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
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
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
b0e8fb42cd
AAAAA
2019-12-16 14:00:14 +01:00
05497bb392
Changes required to enable for maintenance protocols
...
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
b54c8a6a2a
Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
...
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
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
Ghommie