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

1853 Commits

Author SHA1 Message Date
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05: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
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
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
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
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
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01: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
Ghommie
6593b2a5a7 Fixes some quirks not being properly removed when deleted. 2019-12-15 23:02:41 +01:00
loginsandylogout
6f9be0c863 saves the world 2019-12-15 14:11:44 -06:00
Ghommie
80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
loginsandylogout
0f40db60ce honk 2019-12-15 03:38:00 -06:00
Ghommie
081d3df750 This is one serious Pepe Silvia complex. 2019-12-14 22:52:40 +01:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451 
Fixing character setup preview icons.
 2019-12-12 09:30:34 -08:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01: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
Putnam3145
12003e8f59 Merge pull request #10130 from kappa-sama/patch-13 
unmodularize hulk
 2019-12-09 13:40:52 -08:00
Putnam3145
f33d4b3d18 Merge pull request #10108 from DeltaFire15/cbt-critical-fix 
Screaming no longer is a viable strategy against clockies
 2019-12-09 13:07:02 -08:00
kappa-sama
eb638adfa9 yw ghom 2019-12-09 10:10:14 -05:00
kevinz000
6cbb0e3ca8 Update good.dm 2019-12-08 19:44:26 -07:00
kevinz000
3cacb998dd Merge pull request #9903 from PersianXerxes/removeFreeNVG 
Removes the night vision quirk
 2019-12-08 19:37:06 -07:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Useroth
a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
DeltaFire
c0433ec944 I scream 
why can't I read
 2019-12-08 04:25:37 +01:00
DeltaFire
59e97989c0 I scream 
Hnnnnngh
 2019-12-08 04:20:04 +01:00
DeltaFire
88acc15fe5 scream if you want, it won't help you. 
Removes oxydamage from the "did you take damage" calculation for stuntime reduction
 2019-12-08 03:46:55 +01:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
TrilbySpaceClone
c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Artur
19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Putnam3145
4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 
Ports "Slightly improves visible and audible messages."
 2019-12-05 21:16:47 -08:00
kevinz000
b8bb0f2924 Merge pull request #10048 from Ghommie/Ghommie-cit426 
Demodularize moodlets.
 2019-12-05 21:56:29 -07:00
kevinz000
6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 
Updating supply pods code.
 2019-12-05 21:54:42 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000
f937c4d877 Merge pull request #10046 from Ghommie/Ghommie-cit424 
Ports flag for bespoke elements.
 2019-12-05 21:50:19 -07:00