diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index e0aaeb07d2d..5cd3a76314b 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -174,6 +174,8 @@ #define PLUMBING_PIPE_VISIBILE_LAYER 2.495//layer = initial(layer) + ducting_layer / 3333 in atmospherics/handle_layer() to determine order of duct overlap #define BOT_PATH_LAYER 2.497 #define LOW_OBJ_LAYER 2.5 +#define LOW_SIGIL_LAYER 2.52 // BUBBER EDIT ADDITION +#define SIGIL_LAYER 2.53 // BUBBER EDIT ADDITION #define HIGH_PIPE_LAYER 2.54 // Anything above this layer is not "on" a turf for the purposes of washing // I hate this life of ours diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 7ecadd4891c..649ae3e3a34 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -121,103 +121,6 @@ ADMIN_VERB(cmd_admin_add_freeform_ai_law, R_ADMIN, "Add Custom AI Law", "Add a c BLACKBOX_LOG_ADMIN_VERB("Add Custom AI Law") -ADMIN_VERB(call_shuttle, R_ADMIN, "Call Shuttle", "Force a shuttle call with additional modifiers.", ADMIN_CATEGORY_EVENTS) - if(EMERGENCY_AT_LEAST_DOCKED) - return - - var/confirm = tgui_alert(user, "You sure?", "Confirm", list("Yes", "Yes (No Recall)", "No")) - switch(confirm) - if(null, "No") - return - if("Yes (No Recall)") - SSshuttle.admin_emergency_no_recall = TRUE - SSshuttle.emergency.mode = SHUTTLE_IDLE - - SSshuttle.emergency.request() - BLACKBOX_LOG_ADMIN_VERB("Call Shuttle") - log_admin("[key_name(user)] admin-called the emergency shuttle.") - message_admins(span_adminnotice("[key_name_admin(user)] admin-called the emergency shuttle[confirm == "Yes (No Recall)" ? " (non-recallable)" : ""].")) - -ADMIN_VERB(cancel_shuttle, R_ADMIN, "Cancel Shuttle", "Recall the shuttle, regardless of circumstances.", ADMIN_CATEGORY_EVENTS) - if(EMERGENCY_AT_LEAST_DOCKED) - return - - if(tgui_alert(user, "You sure?", "Confirm", list("Yes", "No")) != "Yes") - return - SSshuttle.admin_emergency_no_recall = FALSE - SSshuttle.emergency.cancel() - BLACKBOX_LOG_ADMIN_VERB("Cancel Shuttle") - log_admin("[key_name(user)] admin-recalled the emergency shuttle.") - message_admins(span_adminnotice("[key_name_admin(user)] admin-recalled the emergency shuttle.")) - -ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't getting out.", ADMIN_CATEGORY_EVENTS) - if(SSshuttle.emergency.mode == SHUTTLE_DISABLED) - to_chat(user, span_warning("Error, shuttle is already disabled.")) - return - - if(tgui_alert(user, "You sure?", "Confirm", list("Yes", "No")) != "Yes") - return - - message_admins(span_adminnotice("[key_name_admin(user)] disabled the shuttle.")) - - SSshuttle.last_mode = SSshuttle.emergency.mode - SSshuttle.last_call_time = SSshuttle.emergency.timeLeft(1) - SSshuttle.admin_emergency_no_recall = TRUE - SSshuttle.emergency.setTimer(0) - SSshuttle.emergency.mode = SHUTTLE_DISABLED - priority_announce( - text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.", - title = "Uplink Failure", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', - sender_override = "Emergency Shuttle Uplink Alert", - color_override = "grey", - ) - -ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting out.", ADMIN_CATEGORY_EVENTS) - if(SSshuttle.emergency.mode != SHUTTLE_DISABLED) - to_chat(user, span_warning("Error, shuttle not disabled.")) - return - - if(tgui_alert(user, "You sure?", "Confirm", list("Yes", "No")) != "Yes") - return - - message_admins(span_adminnotice("[key_name_admin(user)] enabled the emergency shuttle.")) - SSshuttle.admin_emergency_no_recall = FALSE - SSshuttle.emergency_no_recall = FALSE - if(SSshuttle.last_mode == SHUTTLE_DISABLED) //If everything goes to shit, fix it. - SSshuttle.last_mode = SHUTTLE_IDLE - - SSshuttle.emergency.mode = SSshuttle.last_mode - if(SSshuttle.last_call_time < 10 SECONDS && SSshuttle.last_mode != SHUTTLE_IDLE) - SSshuttle.last_call_time = 10 SECONDS //Make sure no insta departures. - SSshuttle.emergency.setTimer(SSshuttle.last_call_time) - priority_announce( - text = "Emergency Shuttle uplink reestablished, shuttle enabled.", - title = "Uplink Restored", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', - sender_override = "Emergency Shuttle Uplink Alert", - color_override = "green", - ) - -ADMIN_VERB(hostile_environment, R_ADMIN, "Hostile Environment", "Disable the shuttle, naturally.", ADMIN_CATEGORY_EVENTS) - switch(tgui_alert(user, "Select an Option", "Hostile Environment Manager", list("Enable", "Disable", "Clear All"))) - if("Enable") - if (SSshuttle.hostile_environments["Admin"] == TRUE) - to_chat(user, span_warning("Error, admin hostile environment already enabled.")) - else - message_admins(span_adminnotice("[key_name_admin(user)] Enabled an admin hostile environment")) - SSshuttle.registerHostileEnvironment("Admin") - if("Disable") - if (!SSshuttle.hostile_environments["Admin"]) - to_chat(user, span_warning("Error, no admin hostile environment found.")) - else - message_admins(span_adminnotice("[key_name_admin(user)] Disabled the admin hostile environment")) - SSshuttle.clearHostileEnvironment("Admin") - if("Clear All") - message_admins(span_adminnotice("[key_name_admin(user)] Disabled all current hostile environment sources")) - SSshuttle.hostile_environments.Cut() - SSshuttle.checkHostileEnvironment() - ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS) var/list/nukes = list() for (var/obj/machinery/nuclearbomb/bomb in world) diff --git a/modular_skyrat/modules/company_imports/code/objects/jarnsmiour/special_metals.dm b/modular_skyrat/modules/company_imports/code/objects/jarnsmiour/special_metals.dm index 8217760007f..cc5c6ef4541 100644 --- a/modular_skyrat/modules/company_imports/code/objects/jarnsmiour/special_metals.dm +++ b/modular_skyrat/modules/company_imports/code/objects/jarnsmiour/special_metals.dm @@ -6,7 +6,7 @@ name = "cobolterium" desc = "Cobolterium" color = list(0.2,0.5,0.7,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) - greyscale_colors = "#264d61" + greyscale_color = "#264d61" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL = TRUE) sheet_type = /obj/item/stack/sheet/cobolterium @@ -35,7 +35,7 @@ name = "copporcitite" desc = "Copporcitite" color = list(0.8,0.35,0.1,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) - greyscale_colors = "#c55a1d" + greyscale_color = "#c55a1d" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL = TRUE) sheet_type = /obj/item/stack/sheet/copporcitite @@ -64,7 +64,7 @@ name = "tinumium" desc = "Tinumium" color = list(0.45,0.5,0.6,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) - greyscale_colors = "#717e97" + greyscale_color = "#717e97" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL = TRUE) sheet_type = /obj/item/stack/sheet/tinumium @@ -93,7 +93,7 @@ name = "brussite" desc = "Brussite" color = list(0.9,0.75,0.4,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) - greyscale_colors = "#E1C16E" + greyscale_color = "#E1C16E" categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL = TRUE) sheet_type = /obj/item/stack/sheet/brussite diff --git a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm index a3181b2f538..66cd8f00748 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm @@ -214,7 +214,7 @@ item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/syndie_revolver /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/syndie_revolver/PopulateContents() - new /obj/item/gun/ballistic/revolver/syndicate(src) + new /obj/item/gun/ballistic/revolver(src) new /obj/item/ammo_box/a357(src) new /obj/item/ammo_box/a357(src) diff --git a/modular_skyrat/modules/stone/code/stone.dm b/modular_skyrat/modules/stone/code/stone.dm index e5ed24db881..88dfbc79c08 100644 --- a/modular_skyrat/modules/stone/code/stone.dm +++ b/modular_skyrat/modules/stone/code/stone.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \ value_per_unit = 0.005 beauty_modifier = 0.01 color = "#59595a" - greyscale_colors = "#59595a" + greyscale_color = "#59595a" value_per_unit = 0.0025 armor_modifiers = list(MELEE = 0.75, BULLET = 0.5, LASER = 1.25, ENERGY = 0.5, BOMB = 0.5, BIO = 0.25, FIRE = 1.5, ACID = 1.5) beauty_modifier = 0.3