shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3b82e34db6e88727e8f08b552f4920234c8dd066
GS13NG/code/modules
T
History
Trilbyspaceclone 3b82e34db6 Update code/modules/cargo/packs/emergency.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-17 15:48:02 -05:00
..
admin
Merge pull request #10623 from Putnam3145/antag-overhaul
2020-02-06 16:25:22 -07:00
antagonists
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
assembly
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
atmospherics
Ported atmos reaction priority fix
2020-02-04 14:32:39 -08:00
awaymissions
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
bsql
…
buildmode
…
cargo
Update code/modules/cargo/packs/emergency.dm
2020-02-17 15:48:02 -05:00
chatter
…
client
Merge pull request #10885 from Ghommie/Ghommie-cit553
2020-02-05 23:45:30 -07:00
clothing
Merge pull request #10787 from Seris02/snatchgloves
2020-02-06 23:53:54 -07:00
detectivework
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
emoji
…
error_handler
…
events
yee
2020-02-04 13:24:30 +08:00
fields
…
flufftext
yeet
2020-02-04 13:25:14 +08:00
food_and_drinks
Works now
2020-02-04 12:05:15 +01:00
games
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
goonchat
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
holiday
…
holodeck
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
hydroponics
Merge pull request #10888 from Ghommie/Ghommie-cit554
2020-02-06 00:49:09 -07:00
integrated_electronics
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
jobs
…
keybindings
Merge remote-tracking branch 'citadel/master' into optimization_1
2020-01-24 03:41:40 -07:00
language
Merge pull request #10739 from r4d6/Dwarven_Language
2020-02-05 02:03:42 +01:00
library
Merge pull request #10883 from ancientpower/ghost-newscasters
2020-02-05 23:46:04 -07:00
lighting
…
mapping
…
mining
Merge pull request #10849 from Ghommie/Ghommie-cit547
2020-02-04 03:39:14 -07:00
mob
Merge pull request #10892 from kevinz000/small_guncode_refactor
2020-02-07 23:13:21 +01:00
modular_computers
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
ninja
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
NTNet
Merge pull request #10779 from Ghommie/Ghommie-cit538
2020-02-02 16:31:59 -07:00
oracle_ui
paper code is weird rn
2019-10-20 16:53:47 -05:00
paperwork
not-so-wip now.
2020-01-31 19:20:59 +01:00
photography
…
power
Merge pull request #10849 from Ghommie/Ghommie-cit547
2020-02-04 03:39:14 -07:00
procedural_mapping
not-so-wip now.
2020-01-31 19:20:59 +01:00
projectiles
Merge pull request #10892 from kevinz000/small_guncode_refactor
2020-02-07 23:13:21 +01:00
reagents
Merge pull request #10917 from Arturlang/Hyposprays_QOL
2020-02-06 20:31:46 +01:00
recycling
Forgot this
2020-02-02 13:44:44 +01:00
research
probably fixes plant disk techdisk
2020-02-07 17:58:36 -05:00
ruins
…
security_levels
…
shuttle
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
spells
Merge pull request #10623 from Putnam3145/antag-overhaul
2020-02-06 16:25:22 -07:00
station_goals
…
surgery
runtime is forever, errors are eternal.
2020-02-05 23:48:17 +01:00
tgs
…
tgui
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
tooltip
…
unit_tests
…
uplink
Merge pull request #10787 from Seris02/snatchgloves
2020-02-06 23:53:54 -07:00
vehicles
…
vending
Merge pull request #10798 from necromanceranne/secmainsrejoice
2020-02-06 23:52:49 -07:00
vore
Merge pull request #10772 from Ghommie/Ghommie-cit537
2020-02-06 00:37:52 -07:00
VR
…
zombie
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00