shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

6101 Commits

Author SHA1 Message Date
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -05:00
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
Lin
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
Lin
3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 
Unmodularize gamemodes folder.
 2019-12-19 23:23:20 +00:00
Lin
42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
Lin
66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +00:00
r4d6
dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05:00
nik707
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
Ghommie
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
Putnam3145
7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 
Porting a few martial art code updates.
 2019-12-17 11:47:19 -08:00
Putnam3145
37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -08:00
Putnam3145
0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Putnam3145
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
Putnam3145
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
BlackMajor
95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
Ghommie
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
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Lin
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
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
b0e8fb42cd AAAAA 2019-12-16 14:00:14 +01:00
DeltaFire
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
Lin
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
Ghommie
fb6b01a4ae testing, further improvements. Tired. 2019-12-16 02:29:53 +01:00
BlackMajor
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
6a5a098458 Fixing the blood bank generator. 2019-12-16 01:43:21 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Putnam3145
b7d082a204 Merge pull request #10144 from Linzolle/sabre-noise 
makes the officer's sabre play the un/sheating noise properly
 2019-12-15 12:08:46 -08:00
BlackMajor
c6732bb516 typo lol 2019-12-16 01:28:34 +13:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Lin
43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455 
Allows blood bank generators to be wrenched and unwrenched.
 2019-12-14 23:59:58 +00:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Lin
2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427 
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
 2019-12-14 05:33:31 +00:00
BlackMajor
59d0376985 finished 2019-12-14 17:31:26 +13:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw 
Removes medihounds (actually just makes them a medical aux sprite)
 2019-12-13 16:52:22 -07:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote 
No adrenals for borgs please
 2019-12-12 23:50:34 -06:00
Ghommie
319d4d51bb Allows blood bank generators to be wrenched and unwrenched. 2019-12-13 04:26:37 +01:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00
kevinz000
dfec60c557 Merge pull request #10140 from Putnam3145/dynamic-not-in-secret 
Makes secret's dynamic roundstart report not tell people to contact a coder
 2019-12-11 14:38:49 -07:00
kevinz000
77327ba899 Merge pull request #10143 from Putnam3145/dynamic-midround-doubledip 
Dynamic no longer double dips on refunds for ghost antags with not enough applicants
 2019-12-11 14:38:17 -07:00
Linzolle
6c8dc1d294 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise 2019-12-10 17:57:26 -06:00
Linzolle
bdd72fc797 make sound work? 2019-12-10 17:54:52 -06:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Putnam
7b10c57b5c Actually gotta rework this properly 2019-12-10 14:01:33 -08:00
Putnam
1de118d40e Dynamic no longer double dips on refunds for ghost antags 2019-12-10 13:55:58 -08:00
Putnam
7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00