shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,892 Commits 5 Branches 0 Tags
2d488bee52278675db15310041d691cdaf89eb81
Commit Graph

1818 Commits

Author SHA1 Message Date
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01: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
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02: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
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
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
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
Putnam3145
3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428 
Banishes some "me" emote magic numbers from this realm.
 2019-12-05 20:47:39 -08:00
kevinz000
5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412 
Ports tgstation loom changes, and durathred golems.
 2019-12-05 21:44:25 -07:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
kevinz000
bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419 
Fixes traitor codewords highlight and some other hear signal hooks.
 2019-12-05 21:28:03 -07:00
kevinz000
29497320c1 Merge pull request #10025 from Linzolle/butchering 
refactor butchering component
 2019-12-05 21:19:57 -07:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
53ff425f04 Banishes some magic numbers from this realm. 2019-12-05 21:55:28 +01:00
Artur
82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
Trilbyspaceclone
73891a02bc messenger 2019-12-04 16:56:27 -05:00
Ghommie
07bd51f79a Ports flag for bespoke elements. 2019-12-04 19:38:25 +01:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Ghommie
fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie
6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Ghommie
8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
Linzolle
efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle
a20b975d68 copy paste errors lol 2019-12-01 14:40:25 -06:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
Artur
f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Artur
02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400 
Ports elements: Lightweight shared/global components.
 2019-11-28 23:08:32 -07:00