shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
76fe1a77bc07be5b84ee09a53e1c08a2615e4bff
GS13NG/code/modules
History
DeltaFire 76fe1a77bc Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-13 01:00:50 +01:00
..
actionspeed
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
admin
Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-13 01:00:50 +01:00
antagonists
Merge pull request #13669 from Arturlang/sacrifice_tweaks
2020-11-11 11:16:15 -07:00
arousal
Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
2020-09-27 00:10:12 -07:00
assembly
…
asset_cache
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
atmospherics
Fixes the Layer 3 Outlet Injector mapping asset being on the wrong layer (#13633)
2020-11-01 22:02:15 +01:00
awaymissions
Revert "fix"
2020-11-06 21:45:47 +00:00
bsql
…
buildmode
…
cargo
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
chatter
…
client
Merge pull request #13661 from timothyteakettle/age-verification
2020-11-08 11:07:05 -06:00
clothing
Merge pull request #13616 from Citadel-Station-13/Ghommie-patch-1
2020-10-28 07:49:38 -07:00
detectivework
…
economy
…
emoji
…
error_handler
…
events
Update _event.dm
2020-11-04 16:43:44 -05:00
fields
…
flufftext
…
food_and_drinks
Merge pull request #13533 from shellspeed1/jambalya-
2020-10-10 22:02:46 -07:00
games
…
holiday
Merge pull request #13669 from Arturlang/sacrifice_tweaks
2020-11-11 11:16:15 -07:00
holodeck
…
hydroponics
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
instruments
…
integrated_electronics
covers filters and mixers as well
2020-10-29 21:31:06 -04:00
jobs
sigh
2020-10-03 14:17:13 -07:00
keybindings
oh
2020-10-25 15:38:36 +01:00
language
normalization
2020-10-01 18:46:31 -05:00
library
Merge branch 'master' into spike-loot-differentces
2020-08-30 00:41:42 -04:00
lighting
…
mafia
…
mapping
Revert "fix"
2020-11-06 21:45:47 +00:00
mining
Fixes a bunch of fallout from the tgui PR (#13648)
2020-11-01 21:59:22 +01:00
mob
Merge remote-tracking branch 'upstream/master' into system-corruption
2020-11-13 01:00:50 +01:00
modular_computers
…
movespeed
slime puddles look better and cant be abused by lings (#13567)
2020-11-01 21:40:58 +01:00
newscaster
…
ninja
empulse using range
2020-09-10 19:52:34 +01:00
NTNet
…
paperwork
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
photography
…
plumbing
Review Change Request 1
2020-10-09 09:17:28 -04:00
pool
Makes pool actually check for the reagent instead of checking for a number.
2020-08-30 06:16:21 -07:00
power
Fixes a bunch of fallout from the tgui PR (#13648)
2020-11-01 21:59:22 +01:00
procedural_mapping
…
projectiles
suppression
2020-10-28 13:00:02 -04:00
reagents
Merge pull request #13521 from DeltaFire15/zeolites-tweaking
2020-11-07 00:16:29 -07:00
recycling
fix
2020-09-15 17:27:11 -07:00
research
Makes get_damaged_bodyparts use proper arguments (#13570)
2020-10-17 11:44:15 +02:00
ruins
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
security_levels
https://github.com/tgstation/tgstation/pull/53168/
2020-09-02 18:38:47 +03:00
shielding
debugging done
2020-09-16 00:44:57 -07:00
shuttle
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
smithing
Merge pull request #13481 from DeltaFire15/smithery-fixes
2020-10-03 18:02:42 -07:00
spells
Fixes a bunch of fallout from the tgui PR (#13648)
2020-11-01 21:59:22 +01:00
station_goals
…
surgery
fix (#13632)
2020-11-01 22:03:43 +01:00
tgchat
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tgs
Update TGS DMAPI
2020-11-07 00:37:22 +00:00
tgui
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tgui_panel
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
tooltip
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
unit_tests
Removes the surgery unit test so travis stops randomly failing.
2020-10-15 11:54:03 -07:00
uplink
Merge pull request #13233 from Hatterhat/za-hando
2020-10-10 21:59:05 -07:00
vehicles
…
vending
Merge pull request #13627 from Ghommie/Ghommie-cit841
2020-10-28 07:53:22 -07:00
vore
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
2020-10-11 00:53:18 +02:00
VR
…
zombie
…