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

Merge pull request #8372 from PsiOmegaDelta/Runtimes

Browse Source 
Runtime fixes
This commit is contained in:
Zuhayr
2015-03-07 10:58:13 +10:30
parent 82640b95e9 0262ab0de0
commit 44e280dbe4
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/defines/procs/statistics.dm
View File

@@ -47,9 +47,8 @@ proc/sql_report_death(var/mob/living/carbon/human/H)
if(!H.key || !H.mind) if(!H.key || !H.mind)
return return
var/turf/T = H.loc var/area/placeofdeath = get_area(H)
var/area/placeofdeath = get_area(T.loc) var/podname = placeofdeath ? placeofdeath.name : "Unknown area"
var/podname = placeofdeath.name
var/sqlname = sanitizeSQL(H.real_name) var/sqlname = sanitizeSQL(H.real_name)
var/sqlkey = sanitizeSQL(H.key) var/sqlkey = sanitizeSQL(H.key)
@@ -82,9 +81,8 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
if(!H.key || !H.mind) if(!H.key || !H.mind)
return return
var/turf/T = H.loc var/area/placeofdeath = get_area(H)
var/area/placeofdeath = get_area(T.loc) var/podname = placeofdeath ? placeofdeath.name : "Unknown area"
var/podname = placeofdeath.name
var/sqlname = sanitizeSQL(H.real_name) var/sqlname = sanitizeSQL(H.real_name)
var/sqlkey = sanitizeSQL(H.key) var/sqlkey = sanitizeSQL(H.key)

2
code/modules/events/event_manager.dm
View File

@@ -32,7 +32,7 @@
EC.process() EC.process()
/datum/event_manager/proc/event_complete(var/datum/event/E) /datum/event_manager/proc/event_complete(var/datum/event/E)
if(!E.event_meta) // datum/event is used here and there for random reasons, maintaining "backwards compatibility" if(!E.event_meta || !E.severity) // datum/event is used here and there for random reasons, maintaining "backwards compatibility"
log_debug("Event of '[E.type]' with missing meta-data has completed.") log_debug("Event of '[E.type]' with missing meta-data has completed.")
return return

4
code/modules/mob/mob.dm
View File

@@ -859,7 +859,9 @@ note dizziness decrements automatically in the mob's Life() proc.
canmove = 1 canmove = 1
pixel_y = V.mob_offset_y pixel_y = V.mob_offset_y
else if(buckled) else if(buckled)
if (!buckled.movable) // var/movable is defined at /obj/structure/stool/bed level
// If we're buckled to something else, such as vines, assume it's stationary.
if (!istype(buckled) || !buckled.movable)
anchored = 1 anchored = 1
canmove = 0 canmove = 0
if(istype(buckled,/obj/structure/stool/bed/chair) ) if(istype(buckled,/obj/structure/stool/bed/chair) )

2
code/modules/nano/nanoui.dm
View File

@@ -410,6 +410,8 @@ nanoui is used to open and update nano browser uis
* @return nothing * @return nothing
*/ */
/datum/nanoui/proc/open() /datum/nanoui/proc/open()
if(!user.client)
return
var/window_size = "" var/window_size = ""
if (width && height) if (width && height)

1
code/modules/virus2/helpers.dm
View File

@@ -13,6 +13,7 @@ proc/infection_check(var/mob/living/carbon/M, var/vector = "Airborne")
var/obj/item/I = M.wear_mask var/obj/item/I = M.wear_mask
//masks provide a small bonus and can replace overall bio protection //masks provide a small bonus and can replace overall bio protection
if(I)
score = max(score, round(0.06*I.armor["bio"])) score = max(score, round(0.06*I.armor["bio"]))
if (istype(I, /obj/item/clothing/mask)) if (istype(I, /obj/item/clothing/mask))
score += 1 //this should be added after score += 1 //this should be added after