shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
62c0d59102f44e739c52b813f7cca5774a21467b
GS13NG/code/modules
History
Putnam3145 62c0d59102 Merge pull request #10008 from Seris02/sleepingcarphallucination 
adds sleeping carp wrist wrench/violent grab hallucination
2019-12-05 20:46:26 -08:00
..
admin
Revert "PLASE"
2019-11-24 03:06:08 +00:00
antagonists
Merge pull request #10032 from Ghommie/Ghommie-cit418
2019-12-05 21:33:12 -07:00
assembly
Revert "PLASE"
2019-11-24 03:06:08 +00:00
atmospherics
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +01:00
awaymissions
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
2019-11-24 03:33:02 +00:00
bsql
Revert "PLASE"
2019-11-24 03:06:08 +00:00
buildmode
…
cargo
Merge pull request #9993 from Ghommie/Ghommie-cit412
2019-12-05 21:44:25 -07:00
chatter
…
client
Merge pull request #9922 from GrayRachnid/braintraumasport
2019-11-25 12:31:15 +13:00
clothing
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
2019-12-05 21:09:38 +08:00
crafting
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
2019-11-24 03:33:02 +00:00
detectivework
Revert "PLASE"
2019-11-24 03:06:08 +00:00
emoji
…
error_handler
…
events
Merge pull request #9867 from Ghommie/Ghommie-cit375
2019-11-25 11:31:03 +13:00
fields
Revert "PLASE"
2019-11-24 03:06:08 +00:00
flufftext
does putnam's suggestion
2019-12-02 00:30:20 +08:00
food_and_drinks
Merge pull request #9895 from Thalpy/OrganQoL
2019-11-30 22:22:52 -08:00
games
…
goonchat
Revert "PLASE"
2019-11-24 03:06:08 +00:00
holiday
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
2019-11-24 03:33:02 +00:00
holodeck
Revert "PLASE"
2019-11-24 03:06:08 +00:00
hydroponics
Merge pull request #10049 from Useroth/new-tg-plants
2019-12-05 21:43:24 -07:00
integrated_electronics
Revert "PLASE"
2019-11-24 03:06:08 +00:00
jobs
Fixes ai displays status being reset to "Neutral" on login.
2019-11-29 04:07:56 +01:00
keybindings
Revert "PLASE"
2019-11-24 03:06:08 +00:00
language
…
library
Revert "PLASE"
2019-11-24 03:06:08 +00:00
lighting
Revert "PLASE"
2019-11-24 03:06:08 +00:00
mapping
Revert "PLASE"
2019-11-24 03:06:08 +00:00
mining
Merge pull request #9867 from Ghommie/Ghommie-cit375
2019-11-25 11:31:03 +13:00
mob
Merge pull request #9993 from Ghommie/Ghommie-cit412
2019-12-05 21:44:25 -07:00
modular_computers
Revert "PLASE"
2019-11-24 03:06:08 +00:00
ninja
Merge pull request #9867 from Ghommie/Ghommie-cit375
2019-11-25 11:31:03 +13:00
NTNet
Revert "PLASE"
2019-11-24 03:06:08 +00:00
oracle_ui
Revert "PLASE"
2019-11-24 03:06:08 +00:00
paperwork
couple fxies
2019-12-01 15:39:55 -06:00
photography
Revert "PLASE"
2019-11-24 03:06:08 +00:00
power
Revert "PLASE"
2019-11-24 03:06:08 +00:00
procedural_mapping
…
projectiles
Ports the energy gun empty state overlay fix.
2019-11-29 02:59:54 +01:00
reagents
Merge pull request #9990 from Linzolle/strange-reagent
2019-12-05 21:45:09 -07:00
recycling
Merge pull request #9867 from Ghommie/Ghommie-cit375
2019-11-25 11:31:03 +13:00
research
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
2019-12-06 11:29:34 +13:00
ruins
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
security_levels
…
shuttle
Revert "PLASE"
2019-11-24 03:06:08 +00:00
spells
Revert "PLASE"
2019-11-24 03:06:08 +00:00
station_goals
Revert "PLASE"
2019-11-24 03:06:08 +00:00
surgery
Merge pull request #9895 from Thalpy/OrganQoL
2019-11-30 22:22:52 -08:00
tgs
…
tgui
…
tooltip
Revert "PLASE"
2019-11-24 03:06:08 +00:00
unit_tests
Revert "PLASE"
2019-11-24 03:06:08 +00:00
uplink
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
2019-11-24 03:33:02 +00:00
vehicles
Porting some return type annotations and bad keyword fixes, linter stuff.
2019-12-03 03:31:35 +01:00
vending
Merge branch 'master' into tinytweaks
2019-12-01 23:24:56 -08:00
vore
Revert "pls"
2019-11-24 03:04:04 +00:00
VR
…
zombie
Revert "PLASE"
2019-11-24 03:06:08 +00:00