shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
837052740a176ca6ddff000b73c9ff3c8ee99ee1
GS13NG/code/modules
History
Anonymous 837052740a Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
2019-11-13 11:59:53 +03:00
..
admin
lentext to length.
2019-11-09 23:17:04 +01:00
antagonists
Merge pull request #9771 from Ghommie/Ghommie-cit338
2019-11-12 23:58:46 -07:00
assembly
Merge pull request #9501 from deathride58/stronksecborgs
2019-10-29 21:29:12 -07:00
atmospherics
Merge pull request #8894 from Citadel-Station-13/tgfusion
2019-10-21 21:17:16 -04:00
awaymissions
Porting objective code refactor
2019-11-04 22:05:04 +01:00
bsql
…
buildmode
…
cargo
Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3
2019-11-10 11:30:33 -07:00
chatter
…
client
lentext to length.
2019-11-09 23:17:04 +01:00
clothing
Merge branch 'master' into assu
2019-11-13 11:59:53 +03:00
crafting
Unmodularize and update pAI/Intellicards very slighty.
2019-11-03 04:23:31 +01: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 #9716 from Ghommie/Ghommie-cit317
2019-11-10 11:27:04 -07:00
fields
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
2019-10-28 00:49:22 +01:00
flufftext
Merge pull request #9744 from Seris02/meteorhallucinations
2019-11-10 11:44:41 -07:00
food_and_drinks
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
games
…
goonchat
fixing one mistake, and it's ready.
2019-10-28 01:04:31 +01:00
holiday
better be safe than sorry.
2019-11-03 17:56:30 +01:00
holodeck
…
hydroponics
Merge pull request #9713 from Trilbyspaceclone/sprite-issues
2019-11-10 11:28:49 -07:00
integrated_electronics
Fixing a few throw_at calls and modular computer processors Init.
2019-11-04 00:12:41 +01:00
jobs
Merge branch 'master' into access-clarifications
2019-10-25 22:24:56 -05:00
keybindings
…
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
…
mining
Merge pull request #9746 from Ghommie/Ghommie-cit328
2019-11-10 11:43:41 -07:00
mob
Merge pull request #9755 from Ghommie/Ghommie-cit331
2019-11-12 23:59:31 -07:00
modular_computers
Fixing a few throw_at calls and modular computer processors Init.
2019-11-04 00:12:41 +01:00
ninja
oh flak.
2019-11-03 17:29:53 +01: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
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
photography
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
power
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-10-31 22:40:11 +01:00
procedural_mapping
…
projectiles
Porting Robustin's Syndicate Infiltrator PR
2019-11-11 18:49:18 +01:00
reagents
Merge pull request #9719 from Ghommie/Ghommie-cit318
2019-11-10 11:26:06 -07:00
recycling
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
research
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
ruins
Update hilbertshotel.dm
2019-10-25 23:02:09 +13:00
security_levels
…
shuttle
Porting Robustin's Syndicate Infiltrator PR
2019-11-11 18:49:18 +01:00
spells
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
2019-10-28 00:49:22 +01:00
station_goals
Merge pull request #9578 from deathride58/mapsubsystemimprovements
2019-10-29 21:42:32 -07:00
surgery
Merge pull request #9734 from Ghommie/Ghommie-cit324
2019-11-10 11:45:47 -07:00
tgs
…
tgui
…
tooltip
WEBEDITS
2019-10-29 03:50:49 +00:00
unit_tests
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
uplink
workaround
2019-11-03 18:27:47 -05:00
vehicles
Unmodularize secway and turfs
2019-11-05 05:47:25 +01:00
vending
Ports Welding Hard Hats from /tg/
2019-11-04 02:29:56 +00:00
vore
Fixes some average runtimes, how null...
2019-10-30 00:48:51 +01:00
VR
…
zombie
…