cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-21 20:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hyper/master' into xenoarchtime

Browse Source
This commit is contained in:
jjpark-kb
2020-07-17 20:07:33 -04:00
parent 24e989cb34 281082329f
commit 542ceb7996
22 changed files with 161 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/area/areas/centcom.dm
+2 -1
View File
@@ -32,7 +32,8 @@
/area/centcom/vip
name = "VIP Zone"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
/area/centcom/winterball
/area/centcom/winterball
name = "winterball Zone"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -311,7 +311,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
amount = 10
//Durathread fuck slash-asterisk comments
GLOBAL_LIST_INIT(durathread_recipes, list ( \
GLOBAL_LIST_INIT(durathread_recipes, list ( \
new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
new/datum/stack_recipe("durathread jumpskirt", /obj/item/clothing/under/durathread/skirt, 4, time = 40), \
new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
code/game/objects/structures/signs/signs_maps.dm
+2 -1
View File
@@ -50,7 +50,8 @@
name = "bar"
desc = "A direction sign, pointing out which way the Bar is."
icon_state = "direction_bar"
/obj/structure/sign/directions/cafe
/obj/structure/sign/directions/cafe
name = "cafe"
desc = "A direction sign, pointing out which way the Cafe is."
icon_state = "direction_cafe"
code/game/turfs/simulated/floor/plating/misc_plating.dm
+3 -2
View File
@@ -194,8 +194,9 @@
/turf/open/floor/plating/ice/smooth
icon_state = "smooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice)
/turf/open/floor/plating/ice/colder
canSmoothWith = list(/turf/open/floor/plating/ice/smooth,
/turf/open/floor/plating/ice,
/turf/open/floor/plating/ice/colder)
/turf/open/floor/plating/ice/colder
temperature = 140
code/game/world.dm
+4
View File
@@ -7,6 +7,10 @@ GLOBAL_VAR(restart_counter)
//This happens after the Master subsystem new(s) (it's a global datum)
//So subsystems globals exist, but are not initialised
/world/New()
var/extools = world.GetConfig("env", "EXTOOLS_DLL") || (world.system_type == MS_WINDOWS ? "./byond-extools.dll" : "./libbyond-extools.so")
if (fexists(extools))
call(extools, "maptick_initialize")()
enable_debugger()
log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")