From 952f6ffd0b440a205dbe8e8a57c15fdb33a01cc4 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 1 Jun 2017 20:02:44 -0400 Subject: [PATCH 01/10] itsucanny --- code/datums/uplink_item.dm | 8 + code/game/objects/items/cardboard_cutouts.dm | 176 ++++++++++++++++++ .../items/stacks/sheets/sheet_types.dm | 1 + .../items/weapons/storage/uplink_kits.dm | 6 + icons/obj/cardboard_cutout.dmi | Bin 0 -> 17062 bytes paradise.dme | 1 + 6 files changed, 192 insertions(+) create mode 100644 code/game/objects/items/cardboard_cutouts.dm create mode 100644 icons/obj/cardboard_cutout.dmi diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 1cf08abebd0..cf30e5f1585 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -922,6 +922,14 @@ var/list/uplink_items = list() cost = 2 surplus = 30 +/datum/uplink_item/stealthy_tools/cutouts + name = "Adaptive Cardboard Cutouts" + desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \ + crayon for changing their appearances." + item = /obj/item/weapon/storage/box/syndie_kit/cutouts + cost = 1 + surplus = 20 + // DEVICE AND TOOLS /datum/uplink_item/device_tools diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm new file mode 100644 index 00000000000..aeb5e19a9c6 --- /dev/null +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -0,0 +1,176 @@ +//Cardboard cutouts! They're man-shaped and can be colored with a crayon to look like a human in a certain outfit, although it's limited, discolored, and obvious to more than a cursory glance. +/obj/item/cardboard_cutout + name = "cardboard cutout" + desc = "A vaguely humanoid cardboard cutout. It's completely blank." + icon = 'icons/obj/cardboard_cutout.dmi' + icon_state = "cutout_basic" + burn_state = FLAMMABLE + w_class = 4 + var/list/possible_appearances = list("Assistant", "Clown", "Mime", + "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", + "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", + "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", + "Laughter Demon", "Xenomorph Maid", "Private Security Officer") + var/pushed_over = FALSE //If the cutout is pushed over and has to be righted + var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version + var/lastattacker = null + +/obj/item/cardboard_cutout/attack_hand(mob/living/user) + if(user.a_intent == "help" || pushed_over) + return ..() + user.visible_message("[user] pushes over [src]!", "You push over [src]!") + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) + push_over() + +/obj/item/cardboard_cutout/proc/push_over() + name = initial(name) + desc = "[initial(desc)] It's been pushed over." + icon = initial(icon) + icon_state = "cutout_pushed_over" + color = initial(color) + alpha = initial(alpha) + pushed_over = TRUE + +/obj/item/cardboard_cutout/attack_self(mob/living/user) + if(!pushed_over) + return + user << "You right [src]." + desc = initial(desc) + icon = initial(icon) + icon_state = initial(icon_state) //This resets a cutout to its blank state - this is intentional to allow for resetting + pushed_over = FALSE + +/obj/item/cardboard_cutout/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/toy/crayon)) + change_appearance(I, user) + return + // Why yes, this does closely resemble mob and object attack code. + if(I.flags & NOBLUDGEON) + return + if(!I.force) + playsound(loc, 'sound/weapons/tap.ogg', 20, 1, -1) + else if(I.hitsound) + playsound(loc, I.hitsound, 20, 1, -1) + + user.changeNext_move(CLICK_CD_MELEE) + user.do_attack_animation(src) + + if(I.force) + user.visible_message("[user] has hit \ + [src] with [I]!", "You hit [src] \ + with [I]!") + + if(prob(I.force)) + push_over() + +/obj/item/cardboard_cutout/bullet_act(obj/item/projectile/P) + visible_message("[src] has been hit by [P]!") + playsound(src, 'sound/weapons/slice.ogg', 50, 1) + if(prob(P.damage)) + push_over() + +/obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user) + if(!crayon || !user) + return + if(pushed_over) + to_chat(user, "Right [src] first!") + return + var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances + if(!new_appearance || !crayon) + return + if(!do_after(user, 10, FALSE, src, TRUE)) + return + user.visible_message("[user] gives [src] a new look.", "Voila! You give [src] a new look.") + alpha = 255 + icon = initial(icon) + if(!deceptive) + color = "#FFD7A7" + switch(new_appearance) + if("Assistant") + name = "[pick(first_names_male)] [pick(last_names)]" + desc = "A cardboat cutout of an assistant." + icon_state = "cutout_greytide" + if("Clown") + name = pick(clown_names) + desc = "A cardboard cutout of a clown. You get the feeling that it should be in a corner." + icon_state = "cutout_clown" + if("Mime") + name = pick(mime_names) + desc = "...(A cardboard cutout of a mime.)" + icon_state = "cutout_mime" + if("Traitor") + name = "[pick("Unknown", "Captain")]" + desc = "A cardboard cutout of a traitor." + icon_state = "cutout_traitor" + if("Nuke Op") + name = "[pick("Unknown", "COMMS", "Telecomms", "AI", "stealthy op", "STEALTH", "sneakybeaky", "MEDIC", "Medic")]" + desc = "A cardboard cutout of a nuclear operative." + icon_state = "cutout_fluke" + if("Cultist") + name = "Unknown" + desc = "A cardboard cutout of a cultist." + icon_state = "cutout_cultist" + if("Clockwork Cultist") + name = "[random_name(pick(MALE,FEMALE))]" + desc = "A cardboard cutout of a servant of Ratvar." + icon_state = "cutout_servant" + if("Revolutionary") + name = "Unknown" + desc = "A cardboard cutout of a revolutionary." + icon_state = "cutout_viva" + if("Wizard") + name = "[pick(wizard_first)], [pick(wizard_second)]" + desc = "A cardboard cutout of a wizard." + icon_state = "cutout_wizard" + if("Shadowling") + name = "Unknown" + desc = "A cardboard cutout of a shadowling." + icon_state = "cutout_shadowling" + if("Xenomorph") + name = "alien hunter ([rand(1, 999)])" + desc = "A cardboard cutout of a xenomorph." + icon_state = "cutout_fukken_xeno" + if(prob(25)) + alpha = 75 //Spooky sneaking! + if("Swarmer") + name = "Swarmer ([rand(1, 999)])" + desc = "A cardboard cutout of a swarmer." + icon_state = "cutout_swarmer" + if("Ash Walker") + name = random_name(pick(MALE,FEMALE),"Unathi") + desc = "A cardboard cutout of an ash walker." + icon_state = "cutout_free_antag" + if("Deathsquad Officer") + name = pick(commando_names) + desc = "A cardboard cutout of a death commando." + icon_state = "cutout_deathsquad" + if("Ian") + name = "Ian" + desc = "A cardboard cutout of the HoP's beloved corgi." + icon_state = "cutout_ian" + if("Slaughter Demon") + name = "slaughter demon" + desc = "A cardboard cutout of a slaughter demon." + icon = 'icons/mob/mob.dmi' + icon_state = "daemon" + if("Laughter Demon") + name = "laughter demon" + desc = "A cardboard cutout of a laughter demon." + icon = 'icons/mob/mob.dmi' + icon_state = "bowmon" + if("Xenomorph Maid") + name = "lusty xenomorph maid ([rand(1, 999)])" + desc = "A cardboard cutout of a xenomorph maid." + icon_state = "cutout_lusty" + if("Private Security Officer") + name = "Private Security Officer" + desc = "A cardboard cutout of a private security officer." + icon = 'icons/mob/mob.dmi' + icon_state = "cutout_ntsec" + return 1 + +/obj/item/cardboard_cutout/setDir(newdir) + dir = SOUTH + +/obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed + deceptive = TRUE \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 858365f6d29..67755655fe3 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -237,6 +237,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( new /datum/stack_recipe("folder", /obj/item/weapon/folder), new /datum/stack_recipe("cardboard tube", /obj/item/weapon/c_tube), new /datum/stack_recipe("cardboard box", /obj/structure/closet/cardboard, 4), + new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), ) /obj/item/stack/sheet/cardboard //BubbleWrap diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d721cb46271..5e8d6ce0fa7 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -216,3 +216,9 @@ B.deity_name = "Success" B.icon_state = "greentext" B.item_state = "greentext" + +/obj/item/weapon/storage/box/syndie_kit/cutouts/New() + ..() + for(var/i in 1 to 3) + new/obj/item/cardboard_cutout/adaptive(src) + new/obj/item/toy/crayon/rainbow(src) \ No newline at end of file diff --git a/icons/obj/cardboard_cutout.dmi b/icons/obj/cardboard_cutout.dmi new file mode 100644 index 0000000000000000000000000000000000000000..da5f58d7f7c6f86d2e3ecc394f2db9ab3e997615 GIT binary patch literal 17062 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 Date: Thu, 1 Jun 2017 20:59:00 -0400 Subject: [PATCH 02/10] tochat fix --- code/game/objects/items/cardboard_cutouts.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index aeb5e19a9c6..260ed245a53 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -34,7 +34,7 @@ /obj/item/cardboard_cutout/attack_self(mob/living/user) if(!pushed_over) return - user << "You right [src]." + to_chat(user, "You right [src].") desc = initial(desc) icon = initial(icon) icon_state = initial(icon_state) //This resets a cutout to its blank state - this is intentional to allow for resetting @@ -165,7 +165,6 @@ if("Private Security Officer") name = "Private Security Officer" desc = "A cardboard cutout of a private security officer." - icon = 'icons/mob/mob.dmi' icon_state = "cutout_ntsec" return 1 From 72c874fd50681f675fe98b158ce47ceb2c32d4ab Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 1 Jun 2017 21:32:07 -0400 Subject: [PATCH 03/10] What deathsquad? --- code/game/objects/items/cardboard_cutouts.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 260ed245a53..401397e04c1 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -9,7 +9,7 @@ var/list/possible_appearances = list("Assistant", "Clown", "Mime", "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", - "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", + "Ash Walker", "Commando", "Ian", "Slaughter Demon", "Laughter Demon", "Xenomorph Maid", "Private Security Officer") var/pushed_over = FALSE //If the cutout is pushed over and has to be righted var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version @@ -140,9 +140,9 @@ name = random_name(pick(MALE,FEMALE),"Unathi") desc = "A cardboard cutout of an ash walker." icon_state = "cutout_free_antag" - if("Deathsquad Officer") + if("Commando") name = pick(commando_names) - desc = "A cardboard cutout of a death commando." + desc = "A cardboard cutout of a strange commando." icon_state = "cutout_deathsquad" if("Ian") name = "Ian" From 69e373bbfa020b8961bb7e5f228f95667662c9c4 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Thu, 1 Jun 2017 22:18:05 -0400 Subject: [PATCH 04/10] ops need this. --- code/game/objects/items/cardboard_cutouts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 401397e04c1..8a0b09bd24b 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/cardboard_cutout.dmi' icon_state = "cutout_basic" burn_state = FLAMMABLE - w_class = 4 + w_class = WEIGHT_CLASS_BULKY var/list/possible_appearances = list("Assistant", "Clown", "Mime", "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", @@ -88,7 +88,7 @@ switch(new_appearance) if("Assistant") name = "[pick(first_names_male)] [pick(last_names)]" - desc = "A cardboat cutout of an assistant." + desc = "A cardboard cutout of an assistant." icon_state = "cutout_greytide" if("Clown") name = pick(clown_names) From 4df3e0219053905887e0cc1b093ad73775c0dd15 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Fri, 2 Jun 2017 23:27:55 -0400 Subject: [PATCH 05/10] adds a terrror spider. --- code/game/objects/items/cardboard_cutouts.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 8a0b09bd24b..4986a0f5401 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -10,7 +10,7 @@ "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", "Ash Walker", "Commando", "Ian", "Slaughter Demon", - "Laughter Demon", "Xenomorph Maid", "Private Security Officer") + "Laughter Demon", "Xenomorph Maid", "Private Security Officer", "Terror Spider") var/pushed_over = FALSE //If the cutout is pushed over and has to be righted var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version var/lastattacker = null @@ -153,11 +153,13 @@ desc = "A cardboard cutout of a slaughter demon." icon = 'icons/mob/mob.dmi' icon_state = "daemon" + dir = "SOUTH" if("Laughter Demon") name = "laughter demon" desc = "A cardboard cutout of a laughter demon." icon = 'icons/mob/mob.dmi' icon_state = "bowmon" + dir = "SOUTH" if("Xenomorph Maid") name = "lusty xenomorph maid ([rand(1, 999)])" desc = "A cardboard cutout of a xenomorph maid." @@ -166,9 +168,16 @@ name = "Private Security Officer" desc = "A cardboard cutout of a private security officer." icon_state = "cutout_ntsec" + if("Terror Spider") + name = "Gray Terror Spider" + desc = "A cardboard cutout of a laughter demon." + icon = 'icons/mob/terrorspider.dmi' + icon_state = "terror_gray" + dir = "SOUTH" + return 1 -/obj/item/cardboard_cutout/setDir(newdir) +/obj/item/cardboard_cutout/setDir() dir = SOUTH /obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed From 2b85c80464417c2ac5f230b1cda4f080a09ada8f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 3 Jun 2017 01:03:02 -0400 Subject: [PATCH 06/10] well they COULD be demons... --- code/game/objects/items/cardboard_cutouts.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 4986a0f5401..03e9649f739 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -170,7 +170,7 @@ icon_state = "cutout_ntsec" if("Terror Spider") name = "Gray Terror Spider" - desc = "A cardboard cutout of a laughter demon." + desc = "A cardboard cutout of a terror spider." icon = 'icons/mob/terrorspider.dmi' icon_state = "terror_gray" dir = "SOUTH" From 3b5e6e4ff59c6a97a01ade5343a6e4da60a81376 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sat, 3 Jun 2017 22:01:00 -0400 Subject: [PATCH 07/10] fixes --- code/game/objects/items/cardboard_cutouts.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index 03e9649f739..ec29fdc7546 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -9,14 +9,14 @@ var/list/possible_appearances = list("Assistant", "Clown", "Mime", "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", - "Ash Walker", "Commando", "Ian", "Slaughter Demon", + "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", "Laughter Demon", "Xenomorph Maid", "Private Security Officer", "Terror Spider") var/pushed_over = FALSE //If the cutout is pushed over and has to be righted var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version var/lastattacker = null /obj/item/cardboard_cutout/attack_hand(mob/living/user) - if(user.a_intent == "help" || pushed_over) + if(user.a_intent == I_HELP || pushed_over) return ..() user.visible_message("[user] pushes over [src]!", "You push over [src]!") playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) @@ -72,6 +72,11 @@ /obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user) if(!crayon || !user) return + if(istype(crayon, /obj/item/toy/crayon/spraycan)) + var/obj/item/toy/crayon/spraycan/can = crayon + if(can.capped) + to_chat(user, "The cap is on [src] remove it first!") + return if(pushed_over) to_chat(user, "Right [src] first!") return @@ -103,7 +108,7 @@ desc = "A cardboard cutout of a traitor." icon_state = "cutout_traitor" if("Nuke Op") - name = "[pick("Unknown", "COMMS", "Telecomms", "AI", "stealthy op", "STEALTH", "sneakybeaky", "MEDIC", "Medic")]" + name = "[pick("Unknown", "COMMS", "Telecomms", "AI", "stealthy op", "STEALTH", "sneakybeaky", "MEDIC", "Medic", "Gonk op")]" desc = "A cardboard cutout of a nuclear operative." icon_state = "cutout_fluke" if("Cultist") @@ -140,9 +145,9 @@ name = random_name(pick(MALE,FEMALE),"Unathi") desc = "A cardboard cutout of an ash walker." icon_state = "cutout_free_antag" - if("Commando") + if("Deathsquad Officer") name = pick(commando_names) - desc = "A cardboard cutout of a strange commando." + desc = "A cardboard cutout of a death commando." icon_state = "cutout_deathsquad" if("Ian") name = "Ian" From 4d775a70a5a2d8cb8724e2363c52a719c81de927 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 4 Jun 2017 02:48:34 -0400 Subject: [PATCH 08/10] syndiekit update --- code/game/objects/items/weapons/storage/uplink_kits.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 5e8d6ce0fa7..ca1ae26a843 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -219,6 +219,7 @@ /obj/item/weapon/storage/box/syndie_kit/cutouts/New() ..() + name = "Fortified Artistic Box" for(var/i in 1 to 3) new/obj/item/cardboard_cutout/adaptive(src) - new/obj/item/toy/crayon/rainbow(src) \ No newline at end of file + new/obj/item/toy/crayon/spraycan(src) \ No newline at end of file From ec3af5684d7ca4f75d253b6a525b742c9ce8d498 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Sun, 4 Jun 2017 03:53:23 -0400 Subject: [PATCH 09/10] Its late --- code/game/objects/items/cardboard_cutouts.dm | 27 +++++++++---------- .../items/weapons/storage/uplink_kits.dm | 5 +++- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index ec29fdc7546..d815e8c262f 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -7,10 +7,9 @@ burn_state = FLAMMABLE w_class = WEIGHT_CLASS_BULKY var/list/possible_appearances = list("Assistant", "Clown", "Mime", - "Traitor", "Nuke Op", "Cultist", "Clockwork Cultist", - "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", - "Ash Walker", "Deathsquad Officer", "Ian", "Slaughter Demon", - "Laughter Demon", "Xenomorph Maid", "Private Security Officer", "Terror Spider") + "Traitor", "Nuke Op", "Cultist", "Revolutionary", "Wizard", "Shadowling", "Xenomorph", "Swarmer", + "Deathsquad Officer", "Ian", "Slaughter Demon", + "Laughter Demon", "Xenomorph Maid", "Security Officer", "Terror Spider") var/pushed_over = FALSE //If the cutout is pushed over and has to be righted var/deceptive = FALSE //If the cutout actually appears as what it portray and not a discolored version var/lastattacker = null @@ -115,10 +114,10 @@ name = "Unknown" desc = "A cardboard cutout of a cultist." icon_state = "cutout_cultist" - if("Clockwork Cultist") - name = "[random_name(pick(MALE,FEMALE))]" - desc = "A cardboard cutout of a servant of Ratvar." - icon_state = "cutout_servant" + //if("Clockwork Cultist") + // name = "[random_name(pick(MALE,FEMALE))]" + // desc = "A cardboard cutout of a servant of Ratvar." + // icon_state = "cutout_servant" if("Revolutionary") name = "Unknown" desc = "A cardboard cutout of a revolutionary." @@ -135,16 +134,16 @@ name = "alien hunter ([rand(1, 999)])" desc = "A cardboard cutout of a xenomorph." icon_state = "cutout_fukken_xeno" - if(prob(25)) + if(prob(10)) alpha = 75 //Spooky sneaking! if("Swarmer") name = "Swarmer ([rand(1, 999)])" desc = "A cardboard cutout of a swarmer." icon_state = "cutout_swarmer" - if("Ash Walker") - name = random_name(pick(MALE,FEMALE),"Unathi") - desc = "A cardboard cutout of an ash walker." - icon_state = "cutout_free_antag" + //if("Ash Walker") + // name = random_name(pick(MALE,FEMALE),"Unathi") + // desc = "A cardboard cutout of an ash walker." + // icon_state = "cutout_free_antag" if("Deathsquad Officer") name = pick(commando_names) desc = "A cardboard cutout of a death commando." @@ -169,7 +168,7 @@ name = "lusty xenomorph maid ([rand(1, 999)])" desc = "A cardboard cutout of a xenomorph maid." icon_state = "cutout_lusty" - if("Private Security Officer") + if("Security Officer") name = "Private Security Officer" desc = "A cardboard cutout of a private security officer." icon_state = "cutout_ntsec" diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index ca1ae26a843..9efc5f625a6 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -217,9 +217,12 @@ B.icon_state = "greentext" B.item_state = "greentext" + +/obj/item/weapon/storage/box/syndie_kit/cutouts + name = "Fortified Artistic Box" + /obj/item/weapon/storage/box/syndie_kit/cutouts/New() ..() - name = "Fortified Artistic Box" for(var/i in 1 to 3) new/obj/item/cardboard_cutout/adaptive(src) new/obj/item/toy/crayon/spraycan(src) \ No newline at end of file From e1d75457dc1cec3a51cb24c5cc526e785a0e3355 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Wed, 7 Jun 2017 00:51:33 -0400 Subject: [PATCH 10/10] references.. --- code/datums/uplink_item.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index cf30e5f1585..1aa65685d5e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -925,7 +925,8 @@ var/list/uplink_items = list() /datum/uplink_item/stealthy_tools/cutouts name = "Adaptive Cardboard Cutouts" desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \ - crayon for changing their appearances." + spraycan for changing their appearances." + reference = "ADCC" item = /obj/item/weapon/storage/box/syndie_kit/cutouts cost = 1 surplus = 20