shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,371 Commits 5 Branches 0 Tags
512d046f189ef5e2dfebfb5590e264eceb4de249
Commit Graph

3536 Commits

Author SHA1 Message Date
Ghom
512d046f18 Merge pull request #10128 from Seris02/clownheadset 
gives the clown a headset with a clown megaphone loudmode
 2019-12-26 13:58:45 +01:00
Seris02
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
Ghom
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
r4d6
b909f54ba5 Revert "Revert "Add the option to restrict the Engine that spawn"" 
This reverts commit d851beea16.
 2019-12-23 10:25:37 -05:00
r4d6
d851beea16 Revert "Add the option to restrict the Engine that spawn" 
This reverts commit e3e1f91635.
 2019-12-23 10:23:55 -05:00
r4d6
e3e1f91635 Add the option to restrict the Engine that spawn 2019-12-23 10:06:35 -05:00
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
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
r4d6
383e09651f Suggestions 2019-12-21 14:55:37 -05: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
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
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
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05: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
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
Linzolle
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
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05: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
0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -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
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +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
loginsandylogout
491958475b fixed 2019-12-15 18:48:50 -06: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
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
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08: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
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2019-12-10 11:18:55 +13:00
Artur
488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
Seris02
d73cb74f95 clown loudmode headset 2019-12-09 21:40:39 +08:00
Lin
7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99 
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
 2019-12-09 04:33:23 +00:00
kevinz000
9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446 
Fixes a few holo barriers lacking transparency.
 2019-12-08 19:05:10 -07:00