shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
383014bad38d746008144507922290e92e82142d
GS13NG/code/modules
History
Anonymous 383014bad3 Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/mob/clothing/uniform.dmi
#	icons/mob/clothing/uniform_digi.dmi
#	icons/obj/clothing/uniforms.dmi
2020-04-17 19:40:17 +03:00
..
admin
Merge pull request #11852 from Ghommie/Ghommie-cit681
2020-04-17 05:16:04 -07:00
antagonists
Merge pull request #11730 from Ghommie/Ghommie-cit667
2020-04-17 05:49:09 -07:00
assembly
…
atmospherics
Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
2020-04-12 05:46:07 +02:00
awaymissions
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
bsql
…
buildmode
…
cargo
Merge pull request #11734 from Trilbyspaceclone/patch-329
2020-04-16 19:06:48 +02:00
chatter
…
client
configs
2020-04-16 18:44:05 +02:00
clothing
Merge branch 'master' into trek_tmp
2020-04-17 19:40:17 +03:00
detectivework
…
emoji
…
error_handler
…
events
…
fields
…
flufftext
…
food_and_drinks
Merge pull request #11857 from Trilbyspaceclone/race_drinks
2020-04-17 05:20:53 -07:00
games
…
goonchat
…
holiday
…
holodeck
Update area_copy.dm
2020-04-13 03:29:07 +02:00
hydroponics
Merge pull request #11863 from Trilbyspaceclone/patch-342
2020-04-17 05:51:47 -07:00
instruments
fixes baystruments (#11790)
2020-04-10 15:36:42 +02:00
integrated_electronics
fix everything
2020-04-11 15:32:09 +08:00
jobs
missed one
2020-04-14 17:55:22 -05:00
keybindings
…
language
…
library
…
lighting
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
mapping
…
mining
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
mob
Merge pull request #11730 from Ghommie/Ghommie-cit667
2020-04-17 05:49:09 -07:00
modular_computers
fix everything
2020-04-11 15:32:09 +08:00
newscaster
…
ninja
wew
2020-04-10 03:43:18 +01:00
NTNet
…
oracle_ui
…
paperwork
Merge pull request #11697 from Ghommie/Ghommie-cit655
2020-04-12 16:16:37 -07:00
photography
…
pool
…
power
Update lighting.dm
2020-04-16 05:42:08 +02:00
procedural_mapping
…
projectiles
Conflict fixes
2020-04-14 09:27:54 +03:00
reagents
Merge pull request #11857 from Trilbyspaceclone/race_drinks
2020-04-17 05:20:53 -07:00
recycling
…
research
Merge branch 'master' into tools_andstuff
2020-04-14 10:10:32 -04:00
ruins
…
security_levels
…
shuttle
…
spells
Oopsie
2020-04-11 17:43:09 +02:00
station_goals
…
surgery
I'm amazed this actually works fine.
2020-04-14 21:58:37 +02:00
tgs
…
tgui
…
tooltip
…
unit_tests
…
uplink
Update uplink_bundles.dm
2020-04-14 01:49:14 -07:00
vehicles
Update scooter.dm
2020-04-10 04:33:35 -07:00
vending
Update code/modules/vending/_vending.dm
2020-04-12 00:53:57 +08:00
vore
fix everything
2020-04-11 15:32:09 +08:00
VR
…
zombie
…