From 5bbb78024f9d91a60f755272fd71ddb13df618f1 Mon Sep 17 00:00:00 2001 From: TrustyGun Date: Sun, 31 Jan 2016 14:15:44 -0500 Subject: [PATCH] Removed all instances of the handcuffs from the map and added them to the arcade machine --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 2 +- code/game/machinery/computer/arcade.dm | 1 + code/game/objects/items/weapons/handcuffs.dm | 2 +- .../structures/crates_lockers/closets/secure/security.dm | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index cfd667c0cd2..6d0134872f5 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -1235,7 +1235,7 @@ "axM" = (/obj/structure/table/wood,/obj/item/device/paicard,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "axN" = (/obj/structure/table/wood,/obj/item/device/instrument/violin,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "axO" = (/obj/structure/bed/stool{pixel_y = 8},/obj/effect/landmark/start{name = "Assistant"},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) -"axP" = (/obj/structure/table/wood,/obj/item/toy/cards/deck{pixel_x = 2},/obj/item/clothing/mask/balaclava{pixel_x = -8; pixel_y = 8},/obj/item/weapon/restraints/handcuffs/fake,/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) +"axP" = (/obj/structure/table/wood,/obj/item/toy/cards/deck{pixel_x = 2},/obj/item/clothing/mask/balaclava{pixel_x = -8; pixel_y = 8},/turf/simulated/floor/plasteel,/area/crew_quarters/sleep) "axQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "axR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass{name = "Fitness"},/turf/simulated/floor/plasteel,/area/crew_quarters/fitness) "axS" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/crew_quarters/fitness) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index e5c2c477fdc..f26b8d1acc5 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -36,6 +36,7 @@ /obj/item/weapon/coin/antagtoken = 2, /obj/item/stack/tile/fakespace/loaded = 2, /obj/item/toy/toy_xeno = 2, + /obj/item/weapon/restraints/handcuffs/fake = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 998e370d9a5..e940bffcc48 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -128,7 +128,7 @@ /obj/item/weapon/restraints/handcuffs/fake/kinky name = "kinky handcuffs" - desc = "Fake handcuffs meant for 'Gag' purposes." + desc = "Fake handcuffs meant for erotic roleplay." icon_state = "handcuffGag" /obj/item/weapon/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 192689e2399..92af9d9ac21 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -26,7 +26,6 @@ new /obj/item/clothing/gloves/color/captain(src) new /obj/item/weapon/restraints/handcuffs/cable/zipties(src) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/restraints/handcuffs/fake(src) /obj/structure/closet/secure_closet/hop name = "\proper head of personnel's locker"