shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,805 Commits 5 Branches 0 Tags
b0940456f5fd7629f8d15a15d94de4a38b3dccb5
Commit Graph

9531 Commits

Author SHA1 Message Date
kevinz000 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
Putnam 13a8efe616 no assassination at all (!!) on calm 2019-12-23 00:43:25 -08:00
Ghommie d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghommie b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam dec97a26d5 renamed the storytellers and added secret to voting 2019-12-22 18:44:09 -08:00
Putnam 817787100f haha WHOOPS 2019-12-22 18:30:02 -08:00
Putnam 3ebfe67613 fixed overrefunds (again) 2019-12-22 10:28:57 -08:00
Putnam 86059aeb10 better logging for why candidates aren't working 2019-12-22 09:59:57 -08:00
Ghommie 4fbd9fdca0 Effectively removes the long unrequired roboticist encryption key. 2019-12-22 12:02:15 +01:00
Ghommie 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
TrilbySpaceClone c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Putnam 1c2fe646a4 better stats 2019-12-21 20:52:03 -08:00
Putnam d42ed1ca49 Added extended, deobfuscated, made "how many to vote" bigger 2019-12-21 12:52:35 -08:00
Trilbyspaceclone 0b63e79098 Merge branch 'master' into glassware 2019-12-21 15:41:45 -05:00
r4d6 383e09651f Suggestions 2019-12-21 14:55:37 -05:00
Ghommie 8c5e506a17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382 2019-12-21 18:22:58 +01:00
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Putnam 32ec9d6f50 i believe they call this a "weh" 2019-12-21 08:36:00 -08:00
Putnam d575b20e77 Added statbus support 2019-12-21 08:34:16 -08:00
Putnam 128b857d99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers 2019-12-21 08:31:44 -08:00
Ghom 9d00072072 Merge pull request #10257 from DeltaFire15/communication-magicnumbad 
Removes a magicnumber
 2019-12-21 15:33:27 +01:00
DeltaFire 3738156340 Magic number baaad 2019-12-21 15:16:28 +01:00
Ghom 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
Ghom 7f0ae5dbde I gotta go fast. 2019-12-21 13:04:27 +01:00
Ghom 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
Ghom 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
Ghom 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
Ghom 19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
Ghom a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi 
you can pick up corgis now
 2019-12-21 11:05:36 +01:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Ghom 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
DeltaFire 685425ed55 Atomises out the magicnumber change 2019-12-20 15:26:16 +01:00
Seris02 61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08: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 12aa266efe Missed this one too. 2019-12-19 12:27:30 +01:00
kevinz000 8aca8b8f25 thank you based ghomtainer (when) 2x how did i not notice this 2019-12-19 04:00:37 -07:00
kevinz000 9436d218b4 thank you based ghomtainer (when) 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-19 03:59:57 -07:00
kevinz000 eee52655ef Update flashbang.dm 2019-12-19 01:57:28 -07:00
Ghommie 8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Ghommie ba851d55b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456 2019-12-18 19:42:41 +01:00
DeltaFire e546a59214 Magic number man bad, also all heads can spam CC now 2019-12-18 19:29:35 +01: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
Seris02 6df739a045 changes holofan, adds holofirelock 2019-12-19 00:39:29 +08:00