Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605

[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
This commit is contained in:
LetterJay
2017-10-01 16:30:40 -04:00
committed by GitHub
6 changed files with 50 additions and 6 deletions
@@ -5,6 +5,10 @@
var/list/accesses = list()
var/one_access = 0
/obj/item/electronics/airlock/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Has a neat <i>selection menu</i> for modifying airlock access levels.</span>")
/obj/item/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+4
View File
@@ -33,6 +33,10 @@
var/damage_deflection = 10
var/real_explosion_block //ignore this, just use explosion_block
/obj/machinery/door/examine(mob/user)
..()
to_chat(user, "<span class='notice'>Its maintenance panel is <b>screwed</b> in place.</span>")
/obj/machinery/door/New()
..()
if(density)
@@ -363,6 +363,23 @@
anchored = TRUE
state = 1
/obj/structure/door_assembly/examine(mob/user)
..()
switch(state)
if(0)
if(anchored)
to_chat(user, "<span class='notice'>The anchoring bolts are <b>wrenched</b> in place, but the maintenance panel lacks <i>wiring</i>.</span>")
else
to_chat(user, "<span class='notice'>The assembly is <b>welded together</b>, but the anchoring bolts are <i>unwrenched</i>.</span>")
if(1)
to_chat(user, "<span class='notice'>The maintenance panel is <b>wired</b>, but the circuit slot is <i>empty</i>.</span>")
if(2)
to_chat(user, "<span class='notice'>The circuit is <b>connected loosely</b> to its slot, but the maintenance panel is <i>unscrewed and open</i>.</span>")
if(!mineral || !material)
to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly. There are <i>empty</i> slots for glass windows or mineral covers.</span>")
else
to_chat(user, "<span class='notice'>There is a small <i>paper</i> placard on the assembly.</span>")
/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/pen))
var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN)
+16 -3
View File
@@ -123,9 +123,12 @@
else
return ..()
/obj/structure/falsewall/proc/dismantle(mob/user, disassembled = TRUE)
user.visible_message("<span class='notice'>[user] dismantles the false wall.</span>", "<span class='notice'>You dismantle the false wall.</span>")
playsound(src, 'sound/items/welder.ogg', 100, 1)
/obj/structure/falsewall/proc/dismantle(mob/user, disassembled=TRUE, obj/item/tool = null)
user.visible_message("[user] dismantles the false wall.", "<span class='notice'>You dismantle the false wall.</span>")
if(tool)
playsound(src, tool.usesound, 100, 1)
else
playsound(src, 'sound/items/welder.ogg', 100, 1)
deconstruct(disassembled)
/obj/structure/falsewall/deconstruct(disassembled = TRUE)
@@ -141,6 +144,7 @@
return null
/obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine.
to_chat(user, "<span class='notice'>The outer plating is <b>welded</b> firmly in place.</span>")
return null
/*
@@ -155,6 +159,15 @@
walltype = /turf/closed/wall/r_wall
mineral = /obj/item/stack/sheet/plasteel
/obj/structure/falsewall/reinforced/examine_status(mob/user)
to_chat(user, "<span class='notice'>The outer <b>grille</b> is fully intact.</span>")
return null
/obj/structure/falsewall/reinforced/attackby(obj/item/tool, mob/user)
..()
if(istype(tool, /obj/item/wirecutters))
dismantle(user, TRUE, tool)
/*
* Uranium Falsewalls
*/
@@ -13,8 +13,7 @@
girder_type = /obj/structure/girder/reinforced
explosion_block = 2
/turf/closed/wall/r_wall/examine(mob/user)
..()
/turf/closed/wall/r_wall/deconstruction_hints(mob/user)
switch(d_state)
if(INTACT)
to_chat(user, "<span class='notice'>The outer <b>grille</b> is fully intact.</span>")
+8 -1
View File
@@ -25,6 +25,13 @@
/turf/closed/wall/clockwork)
smooth = SMOOTH_TRUE
/turf/closed/wall/examine(mob/user)
..()
deconstruction_hints(user)
/turf/closed/wall/proc/deconstruction_hints(mob/user)
to_chat(user, "<span class='notice'>The outer plating is <b>welded</b> firmly in place.</span>")
/turf/closed/wall/attack_tk()
return
@@ -287,4 +294,4 @@
to_chat(user, "<span class='notice'>You deconstruct the wall.</span>")
ChangeTurf(/turf/open/floor/plating)
return TRUE
return FALSE
return FALSE