shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

runtime fixes

Browse Source
This commit is contained in:
Poojawa
2018-09-22 04:06:06 -05:00
parent 720b25c6f5
commit 12a9989a7c
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/mecha_equipment.dm
+1 -1
View File
@@ -147,7 +147,7 @@
chassis.occupant_message("[icon2html(src, chassis.occupant)] [message]")
return
/obj/item/mecha_parts/mecha_equipment/log_message(message, message_type=LOG_GAME, color=null)
/obj/item/mecha_parts/mecha_equipment/log_message(message, message_type=LOG_GAME, color=null, log_globally)
if(chassis)
chassis.log_message("([src]) [message]", message_type, color)
else
code/game/mecha/mecha.dm
+1 -1
View File
@@ -1015,7 +1015,7 @@
to_chat(occupant, "[icon2html(src, occupant)] [message]")
return
/obj/mecha/log_message(message as text, message_type=LOG_GAME, color=null)
/obj/mecha/log_message(message as text, message_type=LOG_GAME, color=null, log_globally)
log.len++
log[log.len] = list("time"="[station_time_timestamp()]","date","year"="[GLOB.year_integer+540]","message"="[color?"<font color='[color]'>":null][message][color?"</font>":null]")
..()
code/modules/integrated_electronics/passive/power.dm
+1 -1
View File
@@ -93,7 +93,7 @@
container_type = OPENCONTAINER
complexity = 4
inputs = list()
outputs = list("volume used" = IC_PINTYPE_NUMBER, "self reference" = IC_PINTYPE_REF)
outputs = list("volume used" = IC_PINTYPE_NUMBER, "self reference" = IC_PINTYPE_SELFREF)
activators = list("push ref" = IC_PINTYPE_PULSE_IN)
spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
var/volume = 60
code/modules/projectiles/pins.dm
+3 -2
View File
@@ -60,8 +60,9 @@
if(user)
user.show_message(fail_message, 1)
if(selfdestruct)
user.show_message("<span class='danger'>SELF-DESTRUCTING...</span><br>", 1)
to_chat(user, "<span class='userdanger'>[gun] explodes!</span>")
if(user)
user.show_message("<span class='danger'>SELF-DESTRUCTING...</span><br>", 1)
to_chat(user, "<span class='userdanger'>[gun] explodes!</span>")
explosion(get_turf(gun), -1, 0, 2, 3)
if(gun)
qdel(gun)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -191,7 +191,7 @@
return
switch(action)
if("amount")
if(!is_operational())
if(!is_operational() || QDELETED(beaker))
return
var/target = text2num(params["target"])
if(target in beaker.possible_transfer_amounts)