mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
More runtimes (#7904)
This commit is contained in:
@@ -139,7 +139,7 @@
|
|||||||
|
|
||||||
max_power_rating = initial(max_power_rating) * cap_rating / 2
|
max_power_rating = initial(max_power_rating) * cap_rating / 2
|
||||||
max_temperature = max(initial(max_temperature) - T20C, 0) * ((bin_rating * 4 + cap_rating) / 5) + T20C
|
max_temperature = max(initial(max_temperature) - T20C, 0) * ((bin_rating * 4 + cap_rating) / 5) + T20C
|
||||||
air_contents.volume = max(initial(internal_volume) - 200, 0) + 200 * bin_rating
|
air_contents?.volume = max(initial(internal_volume) - 200, 0) + 200 * bin_rating
|
||||||
set_power_level(power_setting)
|
set_power_level(power_setting)
|
||||||
|
|
||||||
/obj/machinery/atmospherics/unary/heater/proc/set_power_level(var/new_power_setting)
|
/obj/machinery/atmospherics/unary/heater/proc/set_power_level(var/new_power_setting)
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ var/obj/screen/robot_inventory
|
|||||||
else
|
else
|
||||||
//Modules display is hidden
|
//Modules display is hidden
|
||||||
//r.client.screen -= robot_inventory //"store" icon
|
//r.client.screen -= robot_inventory //"store" icon
|
||||||
for(var/atom/A in r.module.modules)
|
for(var/atom/A in r.module?.modules)
|
||||||
if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
|
if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
|
||||||
//Module is not currently active
|
//Module is not currently active
|
||||||
r.client.screen -= A
|
r.client.screen -= A
|
||||||
|
|||||||
@@ -240,6 +240,9 @@ var/list/runechat_image_cache = list()
|
|||||||
if(!client)
|
if(!client)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
// Source Deleting
|
||||||
|
if(QDELETED(speaker))
|
||||||
|
return
|
||||||
// Doesn't want to hear
|
// Doesn't want to hear
|
||||||
if(ismob(speaker) && !client.is_preference_enabled(/datum/client_preference/runechat_mob))
|
if(ismob(speaker) && !client.is_preference_enabled(/datum/client_preference/runechat_mob))
|
||||||
return
|
return
|
||||||
@@ -346,7 +349,7 @@ var/list/runechat_image_cache = list()
|
|||||||
hearing_mobs = hear["mobs"]
|
hearing_mobs = hear["mobs"]
|
||||||
|
|
||||||
for(var/mob/M as anything in hearing_mobs)
|
for(var/mob/M as anything in hearing_mobs)
|
||||||
if(!M.client)
|
if(!M?.client)
|
||||||
continue
|
continue
|
||||||
M.create_chat_message(src, message, italics, classes, audible)
|
M.create_chat_message(src, message, italics, classes, audible)
|
||||||
|
|
||||||
|
|||||||
@@ -60,7 +60,9 @@
|
|||||||
disallow_jobhop = TRUE
|
disallow_jobhop = TRUE
|
||||||
pto_type = PTO_CIVILIAN
|
pto_type = PTO_CIVILIAN
|
||||||
alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern,
|
alt_titles = list("Command Liaison" = /datum/alt_title/command_liaison, "Command Assistant" = /datum/alt_title/command_assistant, "Command Intern" = /datum/alt_title/command_intern,
|
||||||
"Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant)
|
"Bridge Secretary" = /datum/alt_title/bridge_secretary, "Bridge Assistant" = /datum/alt_title/bridge_assistant,
|
||||||
|
"Bridge Officer" = /datum/alt_title/bridge_officer //ChompEDIT add bridge officer
|
||||||
|
)
|
||||||
|
|
||||||
/datum/alt_title/command_liaison
|
/datum/alt_title/command_liaison
|
||||||
title = "Command Liaison"
|
title = "Command Liaison"
|
||||||
|
|||||||
@@ -112,7 +112,7 @@
|
|||||||
user.visible_message("[user] smears paint on [src], covering the entire thing in paint.", "You smear paint on [src], changing the color of the entire thing.", runemessage = "smears paint")
|
user.visible_message("[user] smears paint on [src], covering the entire thing in paint.", "You smear paint on [src], changing the color of the entire thing.", runemessage = "smears paint")
|
||||||
update_appearance()
|
update_appearance()
|
||||||
return
|
return
|
||||||
|
|
||||||
if(user.a_intent == I_HELP)
|
if(user.a_intent == I_HELP)
|
||||||
tgui_interact(user)
|
tgui_interact(user)
|
||||||
else
|
else
|
||||||
@@ -141,7 +141,8 @@
|
|||||||
return FALSE
|
return FALSE
|
||||||
var/x = text2num(params["x"])
|
var/x = text2num(params["x"])
|
||||||
var/y = text2num(params["y"])
|
var/y = text2num(params["y"])
|
||||||
grid[x][y] = color
|
if(grid?[x]?[y])
|
||||||
|
grid[x][y] = color
|
||||||
used = TRUE
|
used = TRUE
|
||||||
update_appearance()
|
update_appearance()
|
||||||
. = TRUE
|
. = TRUE
|
||||||
@@ -291,7 +292,7 @@
|
|||||||
if(new_color)
|
if(new_color)
|
||||||
selected_color = new_color
|
selected_color = new_color
|
||||||
color_drop.color = new_color
|
color_drop.color = new_color
|
||||||
|
|
||||||
cut_overlays()
|
cut_overlays()
|
||||||
if(hud_level)
|
if(hud_level)
|
||||||
add_overlay(color_drop)
|
add_overlay(color_drop)
|
||||||
@@ -320,7 +321,7 @@
|
|||||||
refund_type = /obj/item/stack/material/wood
|
refund_type = /obj/item/stack/material/wood
|
||||||
icon_state = "frame-empty"
|
icon_state = "frame-empty"
|
||||||
build_machine_type = /obj/structure/sign/painting
|
build_machine_type = /obj/structure/sign/painting
|
||||||
|
|
||||||
/obj/structure/sign/painting
|
/obj/structure/sign/painting
|
||||||
name = "Painting"
|
name = "Painting"
|
||||||
desc = "Art or \"Art\"? You decide."
|
desc = "Art or \"Art\"? You decide."
|
||||||
@@ -478,12 +479,12 @@
|
|||||||
/obj/structure/sign/painting/proc/load_persistent()
|
/obj/structure/sign/painting/proc/load_persistent()
|
||||||
if(!persistence_id || !LAZYLEN(SSpersistence.unpicked_paintings))
|
if(!persistence_id || !LAZYLEN(SSpersistence.unpicked_paintings))
|
||||||
return
|
return
|
||||||
|
|
||||||
var/list/painting_category = list()
|
var/list/painting_category = list()
|
||||||
for (var/list/P in SSpersistence.unpicked_paintings)
|
for (var/list/P in SSpersistence.unpicked_paintings)
|
||||||
if(P["persistence_id"] == persistence_id)
|
if(P["persistence_id"] == persistence_id)
|
||||||
painting_category[++painting_category.len] = P
|
painting_category[++painting_category.len] = P
|
||||||
|
|
||||||
var/list/painting
|
var/list/painting
|
||||||
while(!painting)
|
while(!painting)
|
||||||
if(!length(painting_category))
|
if(!length(painting_category))
|
||||||
@@ -495,7 +496,7 @@
|
|||||||
continue //and try again
|
continue //and try again
|
||||||
painting = chosen
|
painting = chosen
|
||||||
SSpersistence.unpicked_paintings -= list(chosen)
|
SSpersistence.unpicked_paintings -= list(chosen)
|
||||||
|
|
||||||
var/title = painting["title"]
|
var/title = painting["title"]
|
||||||
var/author_name = painting["author"]
|
var/author_name = painting["author"]
|
||||||
var/author_ckey = painting["ckey"]
|
var/author_ckey = painting["ckey"]
|
||||||
@@ -504,7 +505,7 @@
|
|||||||
var/obj/item/canvas/new_canvas
|
var/obj/item/canvas/new_canvas
|
||||||
var/w = I.Width()
|
var/w = I.Width()
|
||||||
var/h = I.Height()
|
var/h = I.Height()
|
||||||
|
|
||||||
for(var/T in typesof(/obj/item/canvas))
|
for(var/T in typesof(/obj/item/canvas))
|
||||||
new_canvas = T
|
new_canvas = T
|
||||||
if(initial(new_canvas.width) == w && initial(new_canvas.height) == h)
|
if(initial(new_canvas.width) == w && initial(new_canvas.height) == h)
|
||||||
@@ -514,7 +515,7 @@
|
|||||||
if(!new_canvas)
|
if(!new_canvas)
|
||||||
warning("Couldn't find a canvas to match [w]x[h] of painting")
|
warning("Couldn't find a canvas to match [w]x[h] of painting")
|
||||||
return
|
return
|
||||||
|
|
||||||
new_canvas.fill_grid_from_icon(I)
|
new_canvas.fill_grid_from_icon(I)
|
||||||
new_canvas.generated_icon = I
|
new_canvas.generated_icon = I
|
||||||
new_canvas.icon_generated = TRUE
|
new_canvas.icon_generated = TRUE
|
||||||
@@ -616,7 +617,7 @@
|
|||||||
return
|
return
|
||||||
if(!current_canvas.painting_name)
|
if(!current_canvas.painting_name)
|
||||||
current_canvas.painting_name = "Untitled Artwork"
|
current_canvas.painting_name = "Untitled Artwork"
|
||||||
|
|
||||||
var/data = current_canvas.get_data_string()
|
var/data = current_canvas.get_data_string()
|
||||||
var/md5 = md5(lowertext(data))
|
var/md5 = md5(lowertext(data))
|
||||||
for(var/list/entry in SSpersistence.all_paintings)
|
for(var/list/entry in SSpersistence.all_paintings)
|
||||||
@@ -625,10 +626,10 @@
|
|||||||
var/png_directory = "data/persistent/paintings/[persistence_id]/"
|
var/png_directory = "data/persistent/paintings/[persistence_id]/"
|
||||||
var/png_path = png_directory + "[md5].png"
|
var/png_path = png_directory + "[md5].png"
|
||||||
var/result = rustg_dmi_create_png(png_path,"[current_canvas.width]","[current_canvas.height]",data)
|
var/result = rustg_dmi_create_png(png_path,"[current_canvas.width]","[current_canvas.height]",data)
|
||||||
|
|
||||||
if(result)
|
if(result)
|
||||||
CRASH("Error saving persistent painting: [result]")
|
CRASH("Error saving persistent painting: [result]")
|
||||||
|
|
||||||
SSpersistence.all_paintings += list(list(
|
SSpersistence.all_paintings += list(list(
|
||||||
"persistence_id" = persistence_id,
|
"persistence_id" = persistence_id,
|
||||||
"title" = current_canvas.painting_name,
|
"title" = current_canvas.painting_name,
|
||||||
|
|||||||
@@ -353,7 +353,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
|||||||
else
|
else
|
||||||
//BEGIN CACHED ICON GENERATION.
|
//BEGIN CACHED ICON GENERATION.
|
||||||
var/obj/item/organ/external/chest = get_organ(BP_TORSO)
|
var/obj/item/organ/external/chest = get_organ(BP_TORSO)
|
||||||
base_icon = chest.get_icon(skeleton, !wholeicontransparent)
|
base_icon = chest?.get_icon(skeleton, !wholeicontransparent)
|
||||||
|
|
||||||
var/apply_extra_transparency_leg = organs_by_name[BP_L_LEG] && organs_by_name[BP_R_LEG]
|
var/apply_extra_transparency_leg = organs_by_name[BP_L_LEG] && organs_by_name[BP_R_LEG]
|
||||||
var/apply_extra_transparency_foot = organs_by_name[BP_L_FOOT] && organs_by_name[BP_R_FOOT]
|
var/apply_extra_transparency_foot = organs_by_name[BP_L_FOOT] && organs_by_name[BP_R_FOOT]
|
||||||
|
|||||||
@@ -120,6 +120,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
|
|||||||
var/teppi_warned = FALSE
|
var/teppi_warned = FALSE
|
||||||
var/teppi_mutate = FALSE //Allows Teppi to get their children's colors scrambled, and possibly other things later on!
|
var/teppi_mutate = FALSE //Allows Teppi to get their children's colors scrambled, and possibly other things later on!
|
||||||
|
|
||||||
|
var/teppi_growingup = FALSE // flag to prevent multiple qdels
|
||||||
|
|
||||||
attacktext = list("nipped", "chomped", "bonked", "stamped on")
|
attacktext = list("nipped", "chomped", "bonked", "stamped on")
|
||||||
attack_sound = 'sound/voice/teppi/roar.ogg' // make a better one idiot
|
attack_sound = 'sound/voice/teppi/roar.ogg' // make a better one idiot
|
||||||
friendly = list("snoofs", "nuzzles", "nibbles", "smooshes on")
|
friendly = list("snoofs", "nuzzles", "nibbles", "smooshes on")
|
||||||
@@ -687,7 +689,10 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have?
|
|||||||
var/nutrition_cost = 500 + (nutrition / 2)
|
var/nutrition_cost = 500 + (nutrition / 2)
|
||||||
adjust_nutrition(-nutrition_cost)
|
adjust_nutrition(-nutrition_cost)
|
||||||
new /mob/living/simple_mob/vore/alienanimals/teppi(loc, src)
|
new /mob/living/simple_mob/vore/alienanimals/teppi(loc, src)
|
||||||
qdel(src)
|
if(!teppi_growingup)
|
||||||
|
teppi_growingup = TRUE
|
||||||
|
qdel(src)
|
||||||
|
return
|
||||||
else
|
else
|
||||||
visible_message("\The [src] whines pathetically...", runemessage = "whines")
|
visible_message("\The [src] whines pathetically...", runemessage = "whines")
|
||||||
if(prob(50))
|
if(prob(50))
|
||||||
|
|||||||
@@ -351,8 +351,8 @@
|
|||||||
for (var/mob/G in player_list)
|
for (var/mob/G in player_list)
|
||||||
if (istype(G, /mob/new_player))
|
if (istype(G, /mob/new_player))
|
||||||
continue
|
continue
|
||||||
else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears && \
|
else if(isobserver(G) && G.is_preference_enabled(/datum/client_preference/ghost_ears) && \
|
||||||
G.is_preference_enabled(/datum/client_preference/ghost_see_whisubtle)))
|
G.is_preference_enabled(/datum/client_preference/ghost_see_whisubtle))
|
||||||
if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder)
|
if(is_preference_enabled(/datum/client_preference/whisubtle_vis) || G.client.holder)
|
||||||
to_chat(G, "<span class='psay'>\The [M] thinks, \"[message]\"</span>")
|
to_chat(G, "<span class='psay'>\The [M] thinks, \"[message]\"</span>")
|
||||||
log_say(message,M)
|
log_say(message,M)
|
||||||
|
|||||||
@@ -74,11 +74,12 @@ GLOBAL_LIST_EMPTY(fusion_cores)
|
|||||||
set_strength(target_field_strength)
|
set_strength(target_field_strength)
|
||||||
|
|
||||||
spawn(1)
|
spawn(1)
|
||||||
owned_field.process()
|
if(!QDELETED(owned_field))
|
||||||
owned_field.stability_monitor()
|
owned_field.process()
|
||||||
owned_field.radiation_scale()
|
owned_field.stability_monitor()
|
||||||
owned_field.temp_dump()
|
owned_field.radiation_scale()
|
||||||
owned_field.temp_color()
|
owned_field.temp_dump()
|
||||||
|
owned_field.temp_color()
|
||||||
|
|
||||||
/obj/machinery/power/fusion_core/Topic(href, href_list)
|
/obj/machinery/power/fusion_core/Topic(href, href_list)
|
||||||
if(..())
|
if(..())
|
||||||
@@ -166,4 +167,4 @@ GLOBAL_LIST_EMPTY(fusion_cores)
|
|||||||
if(!owned_field)
|
if(!owned_field)
|
||||||
return FALSE
|
return FALSE
|
||||||
owned_field.plasma_temperature = field_temperature
|
owned_field.plasma_temperature = field_temperature
|
||||||
return TRUE
|
return TRUE
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
/datum/job/secretary
|
/datum/alt_title/bridge_officer
|
||||||
alt_titles = list(
|
title = "Bridge Officer"
|
||||||
"Bridge Officer" = /decl/hierarchy/outfit/job/bridge_officer)
|
title_outfit = /decl/hierarchy/outfit/job/bridge_officer
|
||||||
|
|||||||
@@ -70,6 +70,8 @@
|
|||||||
if(spawned)
|
if(spawned)
|
||||||
B = P.back
|
B = P.back
|
||||||
P.unEquip(P.back)
|
P.unEquip(P.back)
|
||||||
|
if(QDELETED(B)) // for mannequins or such
|
||||||
|
return
|
||||||
B.forceMove(src)
|
B.forceMove(src)
|
||||||
rig_storage = B
|
rig_storage = B
|
||||||
P.drop_item(B)
|
P.drop_item(B)
|
||||||
|
|||||||
Reference in New Issue
Block a user