shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,807 Commits 5 Branches 0 Tags
4e528da5c283fa00367b809a3010268fee970dfe
Commit Graph

1894 Commits

Author SHA1 Message Date
Lin
c836889944 Merge pull request #10370 from Hatterhat/blood-drunk-cripple-bad 
blood drunk buff probably shouldnt cripple you
 2020-01-01 21:21:39 +00:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite 
More nanites from /tg/station
 2019-12-31 19:32:05 -08:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Hatterhat
76e789d3d1 getting limb crippled is a 4head bruh 2019-12-31 00:14:52 -06:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
Ghom
6e506c949e Merge pull request #10348 from Putnam3145/radiation 
fix divide by 0 runtime in new contam
 2019-12-30 11:08:52 +01:00
Ghom
a6e72c8cad ok 2019-12-30 11:00:21 +01:00
kevinz000
d1434c767c Merge pull request #10335 from kappa-sama/patch-12 
mouth slice
 2019-12-30 00:11:38 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
Putnam
1b7e9c6716 wow divide by 0 very cool 2019-12-29 22:03:23 -08:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
keronshb
baf8b28f3a Fixes Reduced Diagnostics and adds disks 
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
 2019-12-29 16:03:38 -05:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
kappa-sama
3fad4edae0 mouth 2019-12-28 23:57:07 -05:00
keronshb
390cfd8b64 Nanite ports from /tg/ 
Ports a couple of the newer nanite features from /tg/
 2019-12-28 16:56:17 -05:00
Ghom
2ad4698225 Merge pull request #10217 from Putnam3145/radiation 
Nerfing radioactive contamination
 2019-12-28 17:21:25 +01:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
Ghom
93248336ea Merge pull request #10265 from Trilbyspaceclone/map_redo 
Cit-iftyed Box map as well as adding back blasters back to armory
 2019-12-27 22:54:35 +01:00
Seris02
a106fde6cc a few fixes here and there and updating it 2019-12-24 23:38:27 +08:00
Seris02
85c5a5dfa1 Merge branch 'rising_bass' of https://github.com/Seris02/Citadel-Station-13 into rising_bass 2019-12-24 22:29:46 +08: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
TrilbySpaceClone
ec0596c404 Update 2019-12-23 18:52:33 -05: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
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05: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
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +01:00
r4d6
c5aef98252 Make things even more organized 2019-12-21 09:17:15 -05:00
r4d6
fb078e18f9 QoL Update 
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
 2019-12-21 09:12:04 -05: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
Putnam
c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Ghom
4016835b0a Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114 
Radiation storms no longer do random mutations in of itself, but are far more lethal
 2019-12-20 14:32:42 +01:00
Ghom
481371bca7 Merge pull request #10193 from Commandersand/yeet 
gamer is now filtered for clowns
 2019-12-20 13:15:54 +01:00
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
r4d6
4608b3852d Add the file for making the submaps actual ruins 2019-12-19 15:28:46 -05:00
Putnam
f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08: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
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Putnam
ef750e8ace contamination nerf 2019-12-16 18:54:59 -08: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
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
Seris02
4a68a5c33f fixes combo text 2019-12-16 12:59:19 +08:00
kevinz000
ce5c42f323 Update good.dm 2019-12-15 17:02:00 -07:00
kevinz000
ea84526661 Update good.dm 2019-12-15 16:58:44 -07:00
Putnam3145
56a349bcd0 Merge pull request #10195 from Ghommie/Ghommie-cit464 
Fixes a few quirks not being properly removed when deleted, also bringing them in line with the rest instead of being removable through surgery.
 2019-12-15 15:24:59 -08:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Ghommie
7118210911 GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D. 
WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
 2019-12-15 23:07:18 +01:00