shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
11ff7802bb5371042a9a87e754318235cf2d2e43
GS13NG/code/modules
History
Anonymous 11ff7802bb Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
2019-10-26 18:06:56 +03:00
..
admin
Merge pull request #9408 from Citadel-Station-13/kevinz000-patch-89
2019-10-25 22:16:27 -05:00
antagonists
Merge pull request #9599 from Ghommie/Ghommie-cit264
2019-10-25 20:13:05 -07:00
assembly
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
atmospherics
Merge pull request #8894 from Citadel-Station-13/tgfusion
2019-10-21 21:17:16 -04:00
awaymissions
Unmodularize lavaknights.
2019-10-24 22:08:36 +02:00
bsql
…
buildmode
…
cargo
Merge pull request #9542 from Trilbyspaceclone/patch-231
2019-10-24 18:51:34 -07:00
chatter
…
client
colourable wings
2019-10-17 22:11:47 -05:00
clothing
Merge branch 'master' into assu
2019-10-26 18:06:56 +03:00
crafting
Update recipes_weapon_and_ammo.dm
2019-10-21 21:07:27 -04:00
detectivework
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
emoji
…
error_handler
…
events
Merge pull request #9607 from Ghommie/Ghommie-cit271
2019-10-25 20:07:48 -07:00
fields
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
flufftext
Update Hallucination.dm
2019-10-04 22:12:35 -07:00
food_and_drinks
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
games
…
goonchat
Merge pull request #9456 from Thalpy/Spookytime
2019-10-15 23:11:35 -07:00
holiday
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
holodeck
Update computer.dm
2019-10-11 20:43:36 -07:00
hydroponics
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
integrated_electronics
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
jobs
Unmodularize job types
2019-10-24 22:44:40 +02:00
keybindings
Heck
2019-09-19 01:45:21 +01:00
language
…
library
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
lighting
Ports "Avoid generating the atom colour list on the lighting object"
2019-10-23 17:09:48 +02:00
mapping
I missed an earlier port.
2019-09-17 01:08:37 +01:00
mining
Merge pull request #9535 from Ghommie/Ghommie-cit247
2019-10-24 19:05:25 -07:00
mob
Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98
2019-10-25 23:17:30 -04:00
modular_computers
…
ninja
ninja shoes.
2019-09-18 04:07:51 +02:00
NTNet
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
oracle_ui
paper code is weird rn
2019-10-20 16:53:47 -05:00
paperwork
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
photography
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
power
Merge pull request #9568 from r4d6/patch-3
2019-10-24 19:04:15 -07:00
procedural_mapping
…
projectiles
Merge pull request #9535 from Ghommie/Ghommie-cit247
2019-10-24 19:05:25 -07:00
reagents
Merge pull request #9550 from Ghommie/Ghommie-cit253
2019-10-24 18:48:09 -07:00
recycling
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
research
Merge pull request #9606 from Ghommie/Ghommie-cit270
2019-10-25 20:09:26 -07:00
ruins
Update hilbertshotel.dm
2019-10-25 23:02:09 +13:00
security_levels
…
shuttle
Merge pull request #8654 from Ghommie/Ghommie-cit54
2019-10-24 19:07:33 -07:00
spells
Merge pull request #9579 from YakumoChen/shapeshift
2019-10-24 19:13:54 -07:00
station_goals
…
surgery
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
tgs
…
tgui
…
tooltip
…
unit_tests
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
uplink
Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100
2019-10-25 23:16:09 -04:00
vehicles
I missed an earlier port.
2019-09-17 01:08:37 +01:00
vending
Merge branch 'master' into A_Tailer's_art
2019-10-18 00:21:42 -04:00
vore
whatever
2019-10-15 13:19:56 -05:00
VR
unrandomizes mind names.
2019-10-09 01:30:31 +02:00
zombie
I missed an earlier port.
2019-09-17 01:08:37 +01:00