mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Fixes lighting, backpacks getting contaminated, and bombs not working.
This commit is contained in:
@@ -44,8 +44,8 @@ obj/item/proc
|
|||||||
can_contaminate()
|
can_contaminate()
|
||||||
//Clothing and backpacks can be contaminated.
|
//Clothing and backpacks can be contaminated.
|
||||||
if(flags & PLASMAGUARD) return 0
|
if(flags & PLASMAGUARD) return 0
|
||||||
else if(istype(src,/obj/item/clothing)) return 1
|
|
||||||
else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :(
|
else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :(
|
||||||
|
else if(istype(src,/obj/item/clothing)) return 1
|
||||||
|
|
||||||
contaminate()
|
contaminate()
|
||||||
//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
|
//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
|
||||||
|
|||||||
@@ -71,7 +71,9 @@ datum/controller/game_controller/proc/setup()
|
|||||||
spawn(0)
|
spawn(0)
|
||||||
if(ticker)
|
if(ticker)
|
||||||
ticker.pregame()
|
ticker.pregame()
|
||||||
lighting_controller.Initialize()
|
|
||||||
|
lighting_controller.Initialize()
|
||||||
|
|
||||||
|
|
||||||
datum/controller/game_controller/proc/setup_objects()
|
datum/controller/game_controller/proc/setup_objects()
|
||||||
world << "\red \b Initializing objects"
|
world << "\red \b Initializing objects"
|
||||||
|
|||||||
@@ -110,15 +110,11 @@
|
|||||||
icon = 'icons/mob/screen1.dmi'
|
icon = 'icons/mob/screen1.dmi'
|
||||||
icon_state = "x"
|
icon_state = "x"
|
||||||
var/btype = 0 // 0=radio, 1=prox, 2=time
|
var/btype = 0 // 0=radio, 1=prox, 2=time
|
||||||
var/btemp1 = 1500
|
|
||||||
var/btemp2 = 1000 // tank temperatures
|
|
||||||
|
|
||||||
timer
|
timer
|
||||||
btype = 2
|
btype = 2
|
||||||
|
|
||||||
syndicate
|
syndicate
|
||||||
btemp1 = 150
|
|
||||||
btemp2 = 20
|
|
||||||
|
|
||||||
proximity
|
proximity
|
||||||
btype = 1
|
btype = 1
|
||||||
@@ -130,75 +126,49 @@
|
|||||||
/obj/effect/spawner/newbomb/New()
|
/obj/effect/spawner/newbomb/New()
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
var/obj/item/device/transfer_valve/V = new(src.loc)
|
||||||
|
var/obj/item/weapon/tank/plasma/PT = new(V)
|
||||||
|
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
||||||
|
|
||||||
|
V.tank_one = PT
|
||||||
|
V.tank_two = OT
|
||||||
|
|
||||||
|
PT.master = V
|
||||||
|
OT.master = V
|
||||||
|
|
||||||
|
PT.air_contents.temperature = PLASMA_FLASHPOINT
|
||||||
|
PT.air_contents.toxins = 15
|
||||||
|
PT.air_contents.carbon_dioxide = 33
|
||||||
|
PT.air_contents.update_values()
|
||||||
|
|
||||||
|
OT.air_contents.temperature = PLASMA_FLASHPOINT
|
||||||
|
OT.air_contents.oxygen = 48
|
||||||
|
OT.air_contents.update_values()
|
||||||
|
|
||||||
|
var/obj/item/device/assembly/S
|
||||||
|
|
||||||
switch (src.btype)
|
switch (src.btype)
|
||||||
// radio
|
// radio
|
||||||
if (0)
|
if (0)
|
||||||
|
|
||||||
var/obj/item/device/transfer_valve/V = new(src.loc)
|
S = new/obj/item/device/assembly/signaler(V)
|
||||||
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
||||||
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
||||||
|
|
||||||
var/obj/item/device/assembly/signaler/S = new(V)
|
|
||||||
|
|
||||||
V.tank_one = PT
|
|
||||||
V.tank_two = OT
|
|
||||||
V.attached_device = S
|
|
||||||
|
|
||||||
S.holder = V
|
|
||||||
S.toggle_secure()
|
|
||||||
PT.master = V
|
|
||||||
OT.master = V
|
|
||||||
|
|
||||||
PT.air_contents.temperature = btemp1 + T0C
|
|
||||||
OT.air_contents.temperature = btemp2 + T0C
|
|
||||||
|
|
||||||
V.update_icon()
|
|
||||||
|
|
||||||
// proximity
|
// proximity
|
||||||
if (1)
|
if (1)
|
||||||
|
|
||||||
var/obj/item/device/transfer_valve/V = new(src.loc)
|
S = new/obj/item/device/assembly/prox_sensor(V)
|
||||||
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
||||||
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
||||||
|
|
||||||
var/obj/item/device/assembly/prox_sensor/P = new(V)
|
|
||||||
|
|
||||||
V.tank_one = PT
|
|
||||||
V.tank_two = OT
|
|
||||||
V.attached_device = P
|
|
||||||
|
|
||||||
P.holder = V
|
|
||||||
P.toggle_secure()
|
|
||||||
PT.master = V
|
|
||||||
OT.master = V
|
|
||||||
|
|
||||||
|
|
||||||
PT.air_contents.temperature = btemp1 + T0C
|
|
||||||
OT.air_contents.temperature = btemp2 + T0C
|
|
||||||
|
|
||||||
V.update_icon()
|
|
||||||
|
|
||||||
|
|
||||||
// timer
|
// timer
|
||||||
if (2)
|
if (2)
|
||||||
var/obj/item/device/transfer_valve/V = new(src.loc)
|
|
||||||
var/obj/item/weapon/tank/plasma/PT = new(V)
|
|
||||||
var/obj/item/weapon/tank/oxygen/OT = new(V)
|
|
||||||
|
|
||||||
var/obj/item/device/assembly/timer/T = new(V)
|
S = new/obj/item/device/assembly/timer(V)
|
||||||
|
|
||||||
V.tank_one = PT
|
|
||||||
V.tank_two = OT
|
|
||||||
V.attached_device = T
|
|
||||||
|
|
||||||
T.holder = V
|
V.attached_device = S
|
||||||
T.toggle_secure()
|
|
||||||
PT.master = V
|
|
||||||
OT.master = V
|
|
||||||
T.time = 30
|
|
||||||
|
|
||||||
PT.air_contents.temperature = btemp1 + T0C
|
S.holder = V
|
||||||
OT.air_contents.temperature = btemp2 + T0C
|
S.toggle_secure()
|
||||||
|
|
||||||
|
V.update_icon()
|
||||||
|
|
||||||
V.update_icon()
|
|
||||||
del(src)
|
del(src)
|
||||||
@@ -120,7 +120,6 @@ var/list/admin_verbs_server = list(
|
|||||||
/client/proc/check_customitem_activity
|
/client/proc/check_customitem_activity
|
||||||
)
|
)
|
||||||
var/list/admin_verbs_debug = list(
|
var/list/admin_verbs_debug = list(
|
||||||
/client/proc/restart_controller,
|
|
||||||
/client/proc/cmd_admin_list_open_jobs,
|
/client/proc/cmd_admin_list_open_jobs,
|
||||||
/client/proc/Debug2,
|
/client/proc/Debug2,
|
||||||
/client/proc/kill_air,
|
/client/proc/kill_air,
|
||||||
|
|||||||
Reference in New Issue
Block a user