shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
93b1ade0bc1ff561ec2c99db03768edf9296ab77
GS13NG/code/modules
History
ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies 
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
..
admin
Merge pull request #11480 from Ghommie/Ghommie-cit623
2020-03-16 13:22:49 -07:00
antagonists
Rewrote waffle traitor flavor text (#11539)
2020-03-20 15:47:46 +01:00
assembly
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
atmospherics
…
awaymissions
Merge pull request #10327 from Seris02/tggenetics
2020-03-11 17:01:37 -07:00
bsql
…
buildmode
…
cargo
arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)
2020-03-18 19:34:14 +01:00
chatter
…
client
Everyday
2020-03-19 17:34:01 +01:00
clothing
i still feel pain
2020-03-20 13:35:55 -04:00
detectivework
…
emoji
…
error_handler
…
events
Make mass hallucination more admemeable (#11491)
2020-03-20 16:08:11 +01:00
fields
…
flufftext
…
food_and_drinks
Update snacks_pie.dm
2020-03-15 16:16:28 +01:00
games
…
goonchat
…
holiday
…
holodeck
…
hydroponics
Update fermenting_barrel.dm (#11534)
2020-03-20 15:52:09 +01:00
integrated_electronics
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
jobs
…
keybindings
…
language
…
library
…
lighting
…
mapping
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
mining
Merge pull request #11527 from Ghommie/Ghommie-cit628
2020-03-19 18:56:32 -07:00
mob
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
2020-03-21 02:17:13 -04:00
modular_computers
Fixing some bug reports.
2020-03-14 02:34:25 +01:00
newscaster
…
ninja
Shortcut fix for a sticky situation.
2020-03-16 01:23:12 +01:00
NTNet
…
oracle_ui
…
paperwork
Update pen.dm (#11533)
2020-03-20 02:38:52 +01:00
photography
…
pool
…
power
…
procedural_mapping
…
projectiles
fixes beam rifles and some micro optimizations to projectiles and readds the chameleon gun for debugging (#11528)
2020-03-21 02:45:34 +01:00
reagents
Merge pull request #11527 from Ghommie/Ghommie-cit628
2020-03-19 18:56:32 -07:00
recycling
…
research
Merge pull request #11527 from Ghommie/Ghommie-cit628
2020-03-19 18:56:32 -07:00
ruins
…
security_levels
…
shuttle
Merge pull request #10702 from Ghommie/Ghommie-cit528
2020-03-10 17:24:48 -07:00
spells
gunz
2020-03-18 23:53:10 +01:00
station_goals
…
surgery
Update tools.dm
2020-03-20 01:47:42 -04:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
2020-03-21 02:17:13 -04:00
vehicles
…
vending
…
vore
Update living.dm
2020-03-19 15:34:23 +01:00
VR
…
zombie
…