shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,060 Commits 5 Branches 0 Tags
e55da2f9582a48ead2e1c0f6dedac9e7abb9ff29
Commit Graph

1167 Commits

Author SHA1 Message Date
kevinz000
e55da2f958 BYOND 513 2019-10-27 16:28:21 -07:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251 
Fixing radio emotes conflict with drunk memes.
 2019-10-24 18:48:33 -07:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit 
properly ports neovgre from hippie
 2019-10-21 21:17:57 -04:00
deathride58
f7cf10853e Merge pull request #8894 from Citadel-Station-13/tgfusion 
T G F U S I O N
 2019-10-21 21:17:16 -04:00
deathride58
2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
nik707
ba90df997f Merge branch 'master' into wingcolors 2019-10-21 10:25:46 -05:00
kevinz000
9e63413911 Merge pull request #9466 from deathride58/yawnborgs 
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
 2019-10-21 01:04:34 -07:00
kevinz000
838575da50 Merge pull request #9503 from deathride58/tasernerf 
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
 2019-10-21 00:59:58 -07:00
Ghommie
7e9298d5ac Fixing radio emotes conflict with drunk memes. 2019-10-20 12:21:21 +02:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
 2019-10-17 17:29:18 -07:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection 
port just like a ton of surgery changes from tg also abductor too
 2019-10-17 13:13:51 -07:00
kevinz000
033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240 
Fixing tracking implant teleport issues.
 2019-10-17 13:05:15 -07:00
kevinz000
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves 
Halloween Dwarves
 2019-10-17 12:58:28 -07:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
Poojawa
66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-17 05:45:06 -05:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes 
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
 2019-10-16 12:44:34 -07:00
Ghommie
7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
Poojawa
04b414f6b4 Improving Sounds yet again 2019-10-15 08:58:22 -05:00
deathride58
50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
JTGSZ
9cac961ba3 Halloween lava dwarves 2019-10-14 10:27:09 -04:00
Fermi
7b2c8e58ff Fixes freezing and ghost rider 2019-10-14 13:23:39 +01:00
Poojawa
bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
kevinz000
4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205 
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured
 2019-10-13 14:00:52 -07:00
kevinz000
3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2 
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
 2019-10-13 13:55:21 -07:00
deathride58
0c8b82168d Merge branch 'master' into Ghommie-cit222 2019-10-12 11:20:32 -04:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Linzolle
b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
kevinz000
e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff 
Adds more control over species based offsets
 2019-10-11 12:13:19 -07:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
deathride58
60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) 2019-10-11 14:33:32 -04:00
JTGSZ
988a943f01 Try number 2 2019-10-11 02:36:10 -04:00
Ghommie
735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
JTGSZ
2cd7f8f8ce More control over species based offsets 2019-10-08 17:03:51 -04:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
8aacedaefa Merge pull request #9316 from Thalpy/Reagents_bitflats 
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
 2019-10-08 00:33:21 -07:00
kevinz000
f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153 
darkmode/lightmode fixes and tweaks.
 2019-10-08 00:25:51 -07:00
kevinz000
dcb37bfd0e Merge pull request #9418 from Ghommie/Ghommie-cit216 
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
 2019-10-07 23:36:11 -07:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
Ghommie
fce6f13471 Ports "Chat Subsystem ported from TerraGov-Marine-Corps" 2019-10-07 23:58:15 +02:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00