From 87feed7e7bc52bc19ab0cf1f777dc07e60a4281e Mon Sep 17 00:00:00 2001 From: Spamcat Date: Fri, 5 Jul 2013 17:55:38 +0400 Subject: [PATCH 1/4] Nice colours (and a minor bugfix) --- code/game/objects/items/devices/scanners.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 37f4a80937b..8f37ab2f3bc 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -174,8 +174,7 @@ MASS SPECTROMETER user.show_message("\red Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl") else user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl") - if(H.pulse) - user.show_message("\blue Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") + user.show_message("\blue Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") src.add_fingerprint(user) return From 0e4271f97c3bac71c6ff117636f92e04b7952b3a Mon Sep 17 00:00:00 2001 From: Spamcat Date: Fri, 5 Jul 2013 18:20:10 +0400 Subject: [PATCH 2/4] Stage 1: deconstruction. --- code/game/objects/structures/signs.dm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index d955d5cca85..1d36625e031 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -25,10 +25,30 @@ return +/obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) + if(istype(tool, /obj/item/weapon/screwdriver)) + user << "You unfasten the sign with your [tool]." + var/obj/item/sign/S = new(src.loc) + S.name = name + S.desc = desc + S.icon_state = icon_state + del(src) + else + ..() + +/obj/item/sign + name = "sign" + desc = "if you see this, it's a bug" + icon = 'icons/obj/decals.dmi' + icon_state = "securearea" + /obj/structure/sign/map name = "station map" desc = "A framed picture of the station." +/obj/structure/sign/map/attackby() + return ..() + /obj/structure/sign/map/left icon_state = "map-left" @@ -116,6 +136,9 @@ name = "The Maltese Falcon" desc = "The Maltese Falcon, Space Bar and Grill." +/obj/structure/sign/maltesefalcon/attackby() + return ..() + /obj/structure/sign/maltesefalcon/left icon_state = "maltesefalcon-left" From 63de302a09e8d50bb36b71486d56f5f7b3a4a33b Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sat, 6 Jul 2013 01:14:02 +0400 Subject: [PATCH 3/4] Part 2: construction. --- code/game/objects/structures/signs.dm | 55 +++++++++++++++++---------- maps/tgstation.2.1.0.0.1.dmm | 8 ++-- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 1d36625e031..40366221f9b 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -25,34 +25,52 @@ return -/obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) - if(istype(tool, /obj/item/weapon/screwdriver)) +/obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction + if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) user << "You unfasten the sign with your [tool]." var/obj/item/sign/S = new(src.loc) S.name = name S.desc = desc - S.icon_state = icon_state + var/icon/I = icon('icons/obj/decals.dmi', "[icon_state]") + S.icon = I.Scale(24, 24) + //S.sign_state = icon_state + S.sign_type = type del(src) - else - ..() + else ..() /obj/item/sign name = "sign" - desc = "if you see this, it's a bug" - icon = 'icons/obj/decals.dmi' - icon_state = "securearea" + desc = "" + //var/sign_state = "" + var/sign_type -/obj/structure/sign/map +/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction + if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc)) + var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") + if(direction == "Cancel") return + var/obj/S = new sign_type + //S.name = name + //S.desc = desc + //S.icon_state = sign_state + switch(direction) + if("North") + S.pixel_y = -32 + if("East") + S.pixel_x = 32 + if("South") + S.pixel_y = 32 + if("West") + S.pixel_x = -32 + else ..() + +/obj/structure/sign/double/map name = "station map" desc = "A framed picture of the station." -/obj/structure/sign/map/attackby() - return ..() - -/obj/structure/sign/map/left +/obj/structure/sign/double/map/left icon_state = "map-left" -/obj/structure/sign/map/right +/obj/structure/sign/double/map/right icon_state = "map-right" /obj/structure/sign/securearea @@ -132,17 +150,14 @@ desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands." icon_state = "atmosplaque" -/obj/structure/sign/maltesefalcon //The sign is 64x32, so it needs two tiles. ;3 +/obj/structure/sign/double/maltesefalcon //The sign is 64x32, so it needs two tiles. ;3 name = "The Maltese Falcon" desc = "The Maltese Falcon, Space Bar and Grill." -/obj/structure/sign/maltesefalcon/attackby() - return ..() - -/obj/structure/sign/maltesefalcon/left +/obj/structure/sign/double/maltesefalcon/left icon_state = "maltesefalcon-left" -/obj/structure/sign/maltesefalcon/right +/obj/structure/sign/double/maltesefalcon/right icon_state = "maltesefalcon-right" /obj/structure/sign/science //These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map diff --git a/maps/tgstation.2.1.0.0.1.dmm b/maps/tgstation.2.1.0.0.1.dmm index bac0a58d23c..5e1f348e325 100644 --- a/maps/tgstation.2.1.0.0.1.dmm +++ b/maps/tgstation.2.1.0.0.1.dmm @@ -1682,8 +1682,8 @@ "aGr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/security{name = "Security Checkpoint"; req_access = null; req_access_txt = "1"},/turf/simulated/floor,/area/security/checkpoint2) "aGs" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/security/checkpoint2) "aGt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1; name = "Firelock North"},/turf/simulated/floor{icon_state = "delivery"},/area/hallway/secondary/entry) -"aGu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/sign/map/left,/turf/simulated/wall,/area/maintenance/fpmaint2) -"aGv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/sign/map/right,/turf/simulated/wall,/area/maintenance/fpmaint2) +"aGu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/sign/double/map/left,/turf/simulated/wall,/area/maintenance/fpmaint2) +"aGv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/sign/double/map/right,/turf/simulated/wall,/area/maintenance/fpmaint2) "aGw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/fpmaint2) "aGx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aGy" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 1; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/obj/structure/grille{density = 0; icon_state = "brokengrille"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) @@ -6691,8 +6691,8 @@ "cyI" = (/obj/structure/closet/syndicate/personal,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "cyJ" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows2 (NORTH)"; icon_state = "fakewindows2"; dir = 1},/area/syndicate_mothership) "cyK" = (/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) -"cyL" = (/obj/structure/sign/map/left{pixel_y = 32},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) -"cyM" = (/obj/structure/sign/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) +"cyL" = (/obj/structure/sign/double/map/left{pixel_y = 32},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) +"cyM" = (/obj/structure/sign/double/map/right{pixel_y = 32},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "cyN" = (/obj/structure/table,/obj/machinery/microwave,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/syndicate_mothership) "cyO" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/syndicate_mothership) "cyP" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -30; pixel_y = 0; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac) From 5f690e150d2babd6d00659b4a57140df56546d85 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Sat, 6 Jul 2013 02:48:06 +0400 Subject: [PATCH 4/4] Part 3: fixing shit --- code/game/objects/structures/signs.dm | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 40366221f9b..7827749fa1e 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -19,48 +19,50 @@ else return - /obj/structure/sign/blob_act() del(src) return - /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) user << "You unfasten the sign with your [tool]." var/obj/item/sign/S = new(src.loc) S.name = name S.desc = desc - var/icon/I = icon('icons/obj/decals.dmi', "[icon_state]") - S.icon = I.Scale(24, 24) - //S.sign_state = icon_state - S.sign_type = type + S.icon_state = icon_state + //var/icon/I = icon('icons/obj/decals.dmi', icon_state) + //S.icon = I.Scale(24, 24) + S.sign_state = icon_state del(src) else ..() /obj/item/sign name = "sign" desc = "" - //var/sign_state = "" - var/sign_type + icon = 'icons/obj/decals.dmi' + w_class = 3 //big + var/sign_state = "" /obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction if(istype(tool, /obj/item/weapon/screwdriver) && isturf(user.loc)) var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel") if(direction == "Cancel") return - var/obj/S = new sign_type - //S.name = name - //S.desc = desc - //S.icon_state = sign_state + var/obj/structure/sign/S = new(user.loc) switch(direction) if("North") - S.pixel_y = -32 + S.pixel_y = 32 if("East") S.pixel_x = 32 if("South") - S.pixel_y = 32 + S.pixel_y = -32 if("West") S.pixel_x = -32 + else return + S.name = name + S.desc = desc + S.icon_state = sign_state + user << "You fasten \the [S] with your [tool]." + del(src) else ..() /obj/structure/sign/double/map @@ -113,13 +115,11 @@ desc = "A warning sign which reads 'DANGER: FIRE'" icon_state = "fire" - /obj/structure/sign/nosmoking_1 name = "\improper NO SMOKING" desc = "A warning sign which reads 'NO SMOKING'" icon_state = "nosmoking" - /obj/structure/sign/nosmoking_2 name = "\improper NO SMOKING" desc = "A warning sign which reads 'NO SMOKING'"