 kevinz000andGitHub
|
eef68f43cf
|
Merge pull request #9498 from JTGSZ/october-dwarves
Halloween Dwarves
|
2019-10-17 12:58:28 -07:00 |
|
|
kevinz000andGitHub
|
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
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02: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 |
|
|
kevinz000andGitHub
|
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 |
|
|
FermiandFermi
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
deathride58andGitHub
|
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 |
|
|
kevinz000andGitHub
|
e717272129
|
Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
|
2019-10-11 12:13:19 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
GrayRachnid
|
9f8ad74bf9
|
New traumas and some other things.
|
2019-10-08 03:53:01 -04:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
f405cd1be3
|
Merge pull request #8937 from Ghommie/Ghommie-cit153
darkmode/lightmode fixes and tweaks.
|
2019-10-08 00:25:51 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
ThalpyandGitHub
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Poojawa
|
0b00ffb4d0
|
Boosts NPC runtime priority
Doesnt' effect idle NPCs, but once they wake up. WEW
|
2019-10-06 00:00:27 -05:00 |
|
|
ThalpyandGitHub
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
|
Poojawa
|
b589565398
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-03 15:05:26 -05:00 |
|
|
Ghommie
|
a65b4d0b1c
|
hopefully a performance improvement to stop genitalia from having to update everytime.
|
2019-10-03 19:08:11 +02:00 |
|
|
Ghommie
|
7c77f2d2e3
|
testing...
|
2019-10-03 08:57:35 +02:00 |
|
|
Ghommie
|
6dbac16c74
|
Sanitizing the fermis code biohazard.
|
2019-10-03 04:31:11 +02:00 |
|
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05:00 |
|
|
Ghommie
|
81fc0c1b32
|
more foolproofing.
|
2019-10-02 00:37:02 +02:00 |
|
|
kevinz000andGitHub
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
|
FermiandFermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
|
WeblureandGitHub
|
ef6db36e4c
|
Adds Xenobio Hotkeys
|
2019-09-29 18:21:41 -07:00 |
|
|
kevinz000andGitHub
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|
|
kevinz000andGitHub
|
6fa6502b75
|
Merge branch 'master' into tgfusion
|
2019-09-28 00:35:50 -07:00 |
|
|
FermiandFermi
|
888906b4e7
|
Fixes Mk1 !
|
2019-09-27 11:12:53 +01:00 |
|