cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 09:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bayport - welded scrubbers (#1160)

Browse Source 
Port is credit to Zuhayr

changes:

rscadd: "Bayport: Scrubbers are now weldable."
bugfix: "Fixed incorrect messages when welding vents."
This commit is contained in:
Bedshaped
2016-12-21 19:46:13 +00:00
committed by skull132
parent d19c62c081
commit 3a89d01ea0
7 changed files with 86 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ var/list/ventcrawl_machinery = list(
)
// Vent crawling whitelisted items, whoo
/mob/living/var/list/can_enter_vent_with = list(
var/global/list/can_enter_vent_with = list(
/obj/item/device/mmi,
/obj/item/weapon/implant,
/obj/item/device/radio/borg,
@@ -154,7 +154,7 @@ var/list/ventcrawl_machinery = list(
if(vent_found)
break
if(istype(vent_found, /obj/machinery/atmospherics/unary/vent_pump/) && vent_found:is_welded()) // welded check
if(vent_found:is_welded()) // welded check
src << "<span class='warning'>You can't crawl into a welded vent!</span>"
return

2
code/modules/ventcrawl/ventcrawl_atmospherics.dm
View File

@@ -31,7 +31,7 @@
/obj/machinery/atmospherics/proc/ventcrawl_to(var/mob/living/user, var/obj/machinery/atmospherics/target_move, var/direction)
if(target_move)
if(is_type_in_list(target_move, ventcrawl_machinery) && target_move.can_crawl_through())
if(istype(target_move, /obj/machinery/atmospherics/unary/vent_pump/) && target_move:is_welded())
if(target_move:is_welded())
user.visible_message("<span class='warning'>You hear something banging on \the [target_move.name]!</span>", "<span class='notice'>You can't escape from a welded vent.</span>")
else
user.remove_ventcrawl()