From 71e67945c949bb37862fcbab3da3a708d2f923a6 Mon Sep 17 00:00:00 2001 From: texan-down-under <73374039+etherware-novice@users.noreply.github.com> Date: Fri, 2 Sep 2022 12:08:39 -0500 Subject: [PATCH 1/2] Makes a fake all-access card dispenser (#7393) * base_broken * adjustments to make it compile * adds icons * adds to maints * changes it to a circuiet board * typepath fix and grammer * apostrophe * fix Co-authored-by: Candycaneannihalator Co-authored-by: etherware-novice --- code/_globalvars/lists/maintenance_loot.dm | 5 +++ code/game/machinery/allaccess.dm | 30 ++++++++++++++++ code/game/machinery/computer/arcade.dm | 3 +- .../circuitboards/machine_circuitboards.dm | 7 ++++ code/game/objects/items/toys.dm | 36 +++++++++++++++++++ 5 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 code/game/machinery/allaccess.dm diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index b592dcd92da..0b7f4435b14 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -111,5 +111,10 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/reagent_containers/food/drinks/bottle/homemaderum = 1, /obj/item/reagent_containers/food/snacks/grown/poppy = 10, /obj/item/throwing_star = 1, +<<<<<<< HEAD +======= + /obj/item/circuitboard/machine/allaccess = 2, + /obj/item/pen/screwdriver = 8, +>>>>>>> 5a2e97478d... Makes a fake all-access card dispenser (#7393) "" = 3 )) diff --git a/code/game/machinery/allaccess.dm b/code/game/machinery/allaccess.dm new file mode 100644 index 00000000000..e0e063ffed3 --- /dev/null +++ b/code/game/machinery/allaccess.dm @@ -0,0 +1,30 @@ +/obj/machinery/allaccess + name = "All Access Dispenser" + desc = "Some people confuse the Head of Personnel with this. Contains fake all access cards to keep the greytide at bay!" + icon = 'icons/obj/card.dmi' + icon_state = "aa" + var/spawnitem = /obj/item/toy/allaccess + idle_power_usage = 5 + density = FALSE + circuit = /obj/item/circuitboard/machine/allaccess + pass_flags = PASSTABLE + +/obj/machinery/allaccess/attack_hand(mob/living/user) + var/output = new spawnitem + user.put_in_active_hand(output) + to_chat(user, "You take the card out of the dispenser.") + +/obj/machinery/allaccess/power_change() + if(stat & BROKEN) + icon_state = "[initial(icon_state)]-broken" + else + if(powered()) + icon_state = initial(icon_state) + stat &= ~NOPOWER + else + icon_state = "[initial(icon_state)]-off" + stat |= NOPOWER + +/obj/machinery/allaccess/real + desc = "Some people confuse the Head of Personnel with this. Contains real All Access!" // admin spawn for funnies + spawnitem = /obj/item/card/id/captains_spare diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 1f696a9ac3e..4a8d6b424f4 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -58,7 +58,8 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/item/choice_beacon/pet/hamster = 1, /obj/item/choice_beacon/pet/pug = 1, /obj/item/choice_beacon/pet/pingu = 1, - /obj/item/choice_beacon/pet/clown = 1)) + /obj/item/choice_beacon/pet/clown = 1, + /obj/item/toy/allaccess = 1)) /obj/machinery/computer/arcade name = "random arcade" diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 35aa4d23194..0dc1ccaab9b 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -1263,3 +1263,10 @@ /obj/item/circuitboard/machine/clockwork name = "clockwork board (Report This)" icon_state = "clock_mod" + +/obj/item/circuitboard/machine/allaccess + name = "all access dispenser" + icon_state = "generic" + req_components = list( + /obj/item/stock_parts/manipulator = 1, + /obj/item/stock_parts/micro_laser = 1) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6114c53084c..2b93de23068 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -23,6 +23,11 @@ * Clockwork Watches * Toy Daggers * Eldrich stuff +<<<<<<< HEAD +======= + * Batong + * Fake captains card +>>>>>>> 5a2e97478d... Makes a fake all-access card dispenser (#7393) */ @@ -309,9 +314,26 @@ attack_verb = list("pricked", "absorbed", "gored") w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE +<<<<<<< HEAD block_upgrade_walk = 1 block_power = -200 +======= + +/* + * Batong + */ +/obj/item/toy/batong + name = "batong" + desc = "Despite being a cheap plastic imitation of a stunbaton, it can still be charged." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "stunbaton" + item_state = "baton" + lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' + attack_verb = list("batonged", "stunned", "hit") + w_class = WEIGHT_CLASS_SMALL +>>>>>>> 5a2e97478d... Makes a fake all-access card dispenser (#7393) /obj/item/toy/windupToolbox name = "windup toolbox" @@ -1474,6 +1496,20 @@ for(var/i in 1 to rand(1,4)) new /obj/item/toy/reality_pierce(src) +/* + * Fake captains card + */ + +/obj/item/toy/allaccess + name = "captain's spare ID" + desc = "A replica of the glorious captain's card. Issued to annoying greytiders as a joke." + icon = 'icons/obj/card.dmi' + icon_state = "gold" + +/obj/item/toy/allaccess/afterattack() + . = ..() + playsound(src, 'sound/items/bikehorn.ogg', 50, TRUE) + // Serviceborg items /* From 46bc12201309c8f65f329c293d2dd0d84d66bbf4 Mon Sep 17 00:00:00 2001 From: SinguloBot <88859067+SinguloBot@users.noreply.github.com> Date: Fri, 2 Sep 2022 19:09:35 +0200 Subject: [PATCH 2/2] Makes a fake all-access card dispenser