cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some runtimes (hopefully)

Browse Source
This commit is contained in:
Casey
2022-07-19 19:42:03 -04:00
committed by CHOMPStation2
parent 6bec21215a
commit 5e2328eba5
5 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/_onclick/hud/screen_objects.dm
View File

@@ -46,9 +46,8 @@
object_overlays.Cut() object_overlays.Cut()
/obj/screen/inventory/proc/add_overlays() /obj/screen/inventory/proc/add_overlays()
if(hud && hud.mymob && slot_id)
var/mob/user = hud.mymob var/mob/user = hud.mymob
if(hud && user && slot_id)
var/obj/item/holding = user.get_active_hand() var/obj/item/holding = user.get_active_hand()
if(!holding || user.get_equipped_item(slot_id)) if(!holding || user.get_equipped_item(slot_id))

2
code/game/machinery/portable_turret.dm
View File

@@ -419,7 +419,7 @@
return return
ui = SStgui.try_update_ui(user, src, ui) ui = SStgui.try_update_ui(user, src, ui)
if(!ui) if(!ui)
ui = new(user, src, "PortableTurret", name, 500, 400) ui = new(user, src, "PortableTurret", name, ui_x = 500, ui_y = 400)
ui.open() ui.open()
/obj/machinery/porta_turret/tgui_data(mob/user) /obj/machinery/porta_turret/tgui_data(mob/user)

2
code/game/machinery/turret_control.dm
View File

@@ -125,7 +125,7 @@
/obj/machinery/turretid/tgui_interact(mob/user, datum/tgui/ui = null) /obj/machinery/turretid/tgui_interact(mob/user, datum/tgui/ui = null)
ui = SStgui.try_update_ui(user, src, ui) ui = SStgui.try_update_ui(user, src, ui)
if(!ui) if(!ui)
ui = new(user, src, "PortableTurret", name) // 500, 400 ui = new(user, src, "PortableTurret", name, ui_x = 500, ui_y = 400) // 500, 400
ui.open() ui.open()
/obj/machinery/turretid/tgui_data(mob/user) /obj/machinery/turretid/tgui_data(mob/user)

4
code/modules/client/preference_setup/preference_setup.dm
View File

@@ -232,6 +232,10 @@
return 1 return 1
. = OnTopic(href, href_list, usr) . = OnTopic(href, href_list, usr)
if(!pref_mob || !pref_mob.client) // Just in case we disappeared during OnTopic
return 1
if(. & TOPIC_UPDATE_PREVIEW) if(. & TOPIC_UPDATE_PREVIEW)
pref_mob.client.prefs.update_preview_icon() pref_mob.client.prefs.update_preview_icon()
if(. & TOPIC_REFRESH) if(. & TOPIC_REFRESH)

12
code/modules/vore/eating/bellymodes_vr.dm
View File

@@ -320,7 +320,13 @@
if(M.ckey) if(M.ckey)
GLOB.prey_digested_roundstat++ GLOB.prey_digested_roundstat++
<<<<<<< HEAD
=======
var/personal_nutrition_modifier = M.get_digestion_nutrition_modifier()
>>>>>>> 29514067c6... Merge pull request #13368 from Heroman3003/runtime-fix
if((mode_flags & DM_FLAG_LEAVEREMAINS) && M.digest_leave_remains) if((mode_flags & DM_FLAG_LEAVEREMAINS) && M.digest_leave_remains)
handle_remains_leaving(M) handle_remains_leaving(M)
digestion_death(M) digestion_death(M)
@@ -328,6 +334,7 @@
owner.update_icons() owner.update_icons()
if(isrobot(owner)) if(isrobot(owner))
var/mob/living/silicon/robot/R = owner var/mob/living/silicon/robot/R = owner
<<<<<<< HEAD
if(reagent_mode_flags & DM_FLAG_REAGENTSDIGEST && reagents.total_volume < reagents.maximum_volume) //CHOMPedit: digestion producing reagents if(reagent_mode_flags & DM_FLAG_REAGENTSDIGEST && reagents.total_volume < reagents.maximum_volume) //CHOMPedit: digestion producing reagents
R.cell.charge += (nutrition_percent / 100) * compensation * 15 R.cell.charge += (nutrition_percent / 100) * compensation * 15
GenerateBellyReagents_digested() GenerateBellyReagents_digested()
@@ -339,6 +346,11 @@
GenerateBellyReagents_digested() GenerateBellyReagents_digested()
else else
owner.adjust_nutrition((nutrition_percent / 100) * compensation * 4.5) //CHOMPedit end owner.adjust_nutrition((nutrition_percent / 100) * compensation * 4.5) //CHOMPedit end
=======
R.cell.charge += (nutrition_percent / 100) * compensation * 25 * personal_nutrition_modifier
else
owner.adjust_nutrition((nutrition_percent / 100) * compensation * 4.5 * personal_nutrition_modifier)
>>>>>>> 29514067c6... Merge pull request #13368 from Heroman3003/runtime-fix
/obj/belly/proc/steal_nutrition(mob/living/L) /obj/belly/proc/steal_nutrition(mob/living/L)
if(L.nutrition >= 100) if(L.nutrition >= 100)