From 5f293c1d2be611a2f711724c0f66821016ebd0f1 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 10 Dec 2015 15:09:51 -0500 Subject: [PATCH 1/3] The sexy clown jumpsuit now reacts properly on hit. --- code/modules/clothing/under/miscellaneous.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6aa906f4ce3..35c1855f9d7 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -80,6 +80,10 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = 0 +/obj/item/clothing/under/sexyclown/hit_reaction() + playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) + return 0 + /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." From 73471eb8b114a6820e043949d1bff7fbdcaa0464 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 10 Dec 2015 19:19:03 -0500 Subject: [PATCH 2/3] sexy clown is now a sexy object oriented clown --- code/game/machinery/vending.dm | 2 +- code/game/objects/effects/landmarks.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 75cf6e6f70f..823ed4ad25b 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -866,7 +866,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/mask/gas/cyborg = 1,/obj/item/clothing/suit/holidaypriest = 1,/obj/item/clothing/head/wizard/marisa/fake = 1, /obj/item/clothing/suit/wizrobe/marisa/fake = 1,/obj/item/clothing/under/sundress = 1,/obj/item/clothing/head/witchwig = 1,/obj/item/weapon/staff/broom = 1, /obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1, - /obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1, + /obj/item/clothing/under/rank/clown/sexy = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1, /obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, /obj/item/clothing/suit/poncho = 1, /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1,/obj/item/clothing/glasses/cold=1,/obj/item/clothing/glasses/heat=1, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 4d63018ae97..f00cd25ea16 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -225,7 +225,7 @@ /obj/effect/landmark/costume/sexyclown/New() new /obj/item/clothing/mask/gas/sexyclown(src.loc) - new /obj/item/clothing/under/sexyclown(src.loc) + new /obj/item/clothing/under/rank/clown/sexy(src.loc) qdel(src) /obj/effect/landmark/costume/sexymime/New() diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 35c1855f9d7..6b3e7d5a841 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -71,19 +71,14 @@ item_state = "p_suit" item_color = "psyche" -/obj/item/clothing/under/sexyclown +/obj/item/clothing/under/rank/clown/sexy name = "sexy-clown suit" desc = "It makes you look HONKable!" icon_state = "sexyclown" item_state = "sexyclown" item_color = "sexyclown" - fitted = FEMALE_UNIFORM_TOP can_adjust = 0 -/obj/item/clothing/under/sexyclown/hit_reaction() - playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) - return 0 - /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." From 3d1593b49f6a68e5de9bf941a9d45a5adb8d029f Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 10 Dec 2015 19:32:12 -0500 Subject: [PATCH 3/3] edits the map --- _maps/map_files/AsteroidStation/AsteroidStation.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 8ee5af9e9d6..19fc5e5b8d4 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -6108,7 +6108,7 @@ "cnx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel,/area/atmos) "cny" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/simulated/floor/plasteel,/area/atmos) "cnz" = (/obj/item/clothing/shoes/sneakers/black{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint2) -"cnA" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/clothing/under/sexyclown,/obj/item/clothing/under/sexymime,/turf/simulated/floor/plating,/area/maintenance/asmaint2) +"cnA" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/item/clothing/under/rank/clown/sexy,/obj/item/clothing/under/sexymime,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "cnB" = (/obj/structure/grille,/obj/machinery/door/poddoor/preopen{id = "Xenolab"; name = "Test Chamber Containment Door"},/obj/structure/cable/pink{d2 = 2; icon_state = "0-2"},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 5},/area/toxins/xenobiology) "cnC" = (/obj/structure/table/reinforced,/obj/machinery/computer/security/telescreen{dir = 4; name = "Test Chamber Monitor"; network = list("Xeno"); pixel_y = 2},/turf/simulated/floor/plasteel{dir = 8; icon_state = "warnwhite"},/area/toxins/xenobiology) "cnD" = (/obj/structure/cable/pink{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology)