diff --git a/code/game/machinery/casino_ch.dm b/code/game/machinery/casino_ch.dm index 07a7a98c06..8cf7ff7684 100644 --- a/code/game/machinery/casino_ch.dm +++ b/code/game/machinery/casino_ch.dm @@ -122,31 +122,28 @@ var/slot1 = rand(0,9) switch(slot1) - if(1 to 3) symbol1 = "cherry" + if(0 to 3) symbol1 = "cherry" if(4 to 4) symbol1 = "lemon" - //if(4 to 4) symbol1 = "watermelon" if(5 to 5) symbol1 = "bell" if(6 to 6) symbol1 = "four leaf clover" if(7 to 7) symbol1 = "seven" if(8 to 8) symbol1 = "diamond" if(9 to 9) symbol1 = "platinum coin" - var/slot2 = rand(0,9) + var/slot2 = rand(0,16) switch(slot2) - if(1 to 3) symbol2 = "cherry" - if(4 to 4) symbol2 = "lemon" - //if(4 to 4) symbol2 = "watermelon" - if(5 to 5) symbol2 = "bell" - if(6 to 6) symbol2 = "four leaf clover" - if(7 to 7) symbol2 = "seven" - if(8 to 8) symbol2 = "diamond" - if(9 to 9) symbol2 = "platinum coin" + if(0 to 5) symbol2 = "cherry" + if(6 to 7) symbol2 = "lemon" + if(8 to 9) symbol2 = "bell" + if(10 to 11) symbol2 = "four leaf clover" + if(12 to 13) symbol2 = "seven" + if(14 to 15) symbol2 = "diamond" + if(16) symbol2 = "platinum coin" var/slot3 = rand(0,9) switch(slot3) - if(1 to 3) symbol3 = "cherry" + if(0 to 3) symbol3 = "cherry" if(4 to 4) symbol3 = "lemon" - //if(4 to 4) symbol3 = "watermelon" if(5 to 5) symbol3 = "bell" if(6 to 6) symbol3 = "four leaf clover" if(7 to 7) symbol3 = "seven" @@ -851,6 +848,29 @@
  • Special blend whiskey
  • Akvavit
    • + Pets + + Thats it for prizes!

    Now comes the part for the both operators, you got a very important job, it has a lot of responsibility, so it means that you gotta put that first before your own fun, cause unless you do it, a lot of folks are gonna be left sad and dissappointed they cant get any goodies! But the process is simple and can be quick, someone comes to you, they want some chips, or thalers back or a prize, you simply check this nice guide above to determine cost and ask for the amount of thalers or chips needed, if its a prize, then you follow this procedure: @@ -882,6 +902,43 @@ desc = "A fancy casino wallet with flashy lights, oooh~" icon = 'icons/obj/casino_ch.dmi' icon_state = "casinowallet_black" + can_hold = list( + /obj/item/weapon/spacecash, + /obj/item/weapon/card, + /obj/item/clothing/mask/smokable/cigarette/, + /obj/item/device/flashlight/pen, + /obj/item/device/tape, + /obj/item/weapon/cartridge, + /obj/item/device/encryptionkey, + /obj/item/seeds, + /obj/item/stack/medical, + /obj/item/weapon/coin, + /obj/item/weapon/dice, + /obj/item/weapon/disk, + /obj/item/weapon/implanter, + /obj/item/weapon/flame/lighter, + /obj/item/weapon/flame/match, + /obj/item/weapon/forensics, + /obj/item/weapon/glass_extra, + /obj/item/weapon/haircomb, + /obj/item/weapon/hand, + /obj/item/weapon/key, + /obj/item/weapon/lipstick, + /obj/item/weapon/paper, + /obj/item/weapon/pen, + /obj/item/weapon/photo, + /obj/item/weapon/reagent_containers/dropper, + /obj/item/weapon/sample, + /obj/item/weapon/tool/screwdriver, + /obj/item/weapon/stamp, + /obj/item/clothing/accessory/permit, + /obj/item/clothing/accessory/badge, + /obj/item/weapon/makeover, + /obj/item/weapon/spacecasinocash, + /obj/item/weapon/casino_platinum_chip, + /obj/item/weapon/deck, + /obj/item/weapon/book/manual/casino + ) /obj/item/weapon/storage/wallet/casino/verb/toggle_design() set category = "Object" @@ -956,6 +1013,7 @@ var/list/list_clothing = list() var/list/list_misc = list() var/list/list_drinks = list() + var/list/list_pets = list() var/list/prices = list() // Prices for each item, list(/type/path = price), items not in the list don't have a price. // List of vending_product items available. @@ -964,12 +1022,14 @@ var/list/clothing_product_records = list() var/list/misc_product_records = list() var/list/drinks_product_records = list() + var/list/pets_product_records = list() var/category_weapons = 1 //For listing categories, if false then prizes of this categories cant be obtained nor bought for post-shift enjoyment var/category_gear = 1 //If 1 prizes will be only logged var/category_clothing = 1 //If 2 prizes will both be logged and spawned var/category_misc = 1 var/category_drinks = 1 + var/category_pets = 1 list_weapons = list( /obj/item/weapon/scepter, @@ -1050,6 +1110,28 @@ ) + list_pets = list( + /obj/item/weapon/grenade/spawnergrenade/casino, + /obj/item/weapon/grenade/spawnergrenade/casino/goat, + /obj/item/weapon/grenade/spawnergrenade/casino/armadillo, + /obj/item/weapon/grenade/spawnergrenade/casino/cat, + /obj/item/weapon/grenade/spawnergrenade/casino/chicken, + /obj/item/weapon/grenade/spawnergrenade/casino/cow, + /obj/item/weapon/grenade/spawnergrenade/casino/corgi, + /obj/item/weapon/grenade/spawnergrenade/casino/fox, + /obj/item/weapon/grenade/spawnergrenade/casino/lizard, + /obj/item/weapon/grenade/spawnergrenade/casino/penguin, + /obj/item/weapon/grenade/spawnergrenade/casino/snake, + /obj/item/weapon/grenade/spawnergrenade/casino/yithian, + /obj/item/weapon/grenade/spawnergrenade/casino/tindalos, + /obj/item/weapon/grenade/spawnergrenade/casino/fennec, + /obj/item/weapon/grenade/spawnergrenade/casino/redpanda, + /obj/item/weapon/grenade/spawnergrenade/casino/horse, + /obj/item/weapon/grenade/spawnergrenade/casino/otie, + /obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby, + /obj/item/weapon/grenade/spawnergrenade/casino/zorgoia + ) + prices = list( /obj/item/weapon/scepter = 500, /obj/item/weapon/melee/chainofcommand = 250, @@ -1113,7 +1195,26 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 50, /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing = 50, /obj/item/weapon/reagent_containers/food/drinks/bottle/specialwhiskey = 50, - /obj/item/weapon/reagent_containers/food/drinks/bottle/snaps = 50 + /obj/item/weapon/reagent_containers/food/drinks/bottle/snaps = 50, + /obj/item/weapon/grenade/spawnergrenade/casino = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/goat = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/armadillo = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/cat = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/chicken = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/cow = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/corgi = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/fox = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/lizard = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/penguin = 150, + /obj/item/weapon/grenade/spawnergrenade/casino/snake = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/yithian = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/tindalos = 200, + /obj/item/weapon/grenade/spawnergrenade/casino/fennec = 300, + /obj/item/weapon/grenade/spawnergrenade/casino/redpanda = 300, + /obj/item/weapon/grenade/spawnergrenade/casino/horse = 300, + /obj/item/weapon/grenade/spawnergrenade/casino/otie = 500, + /obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby = 500, + /obj/item/weapon/grenade/spawnergrenade/casino/zorgoia = 500 ) @@ -1185,6 +1286,18 @@ product.category = category drinks_product_records.Add(product) + var/list/pets_products = list( + list(list_pets, "cat_pets")) + for(var/current_list in pets_products) + var/category = current_list[2] + + for(var/entry in current_list[1]) + var/datum/stored_item/vending_product/product = new/datum/stored_item/vending_product(src, entry) + + product.price = (entry in prices) ? prices[entry] : 0 + product.category = category + pets_product_records.Add(product) + /obj/machinery/casino_prize_dispenser/Destroy() for(var/datum/stored_item/vending_product/R in weapons_product_records) qdel(R) @@ -1205,6 +1318,10 @@ for(var/datum/stored_item/vending_product/R in drinks_product_records) qdel(R) drinks_product_records = null + + for(var/datum/stored_item/vending_product/R in pets_product_records) + qdel(R) + pets_product_records = null return ..() /obj/machinery/casino_prize_dispenser/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -1316,6 +1433,15 @@ for(var/key = 1 to drinks_product_records.len) var/datum/stored_item/vending_product/I = drinks_product_records[key] + listed_products.Add(list(list( + "key" = key, + "name" = I.item_name, + "price" = I.price, + "color" = I.display_color))) + if("cat_pets") + for(var/key = 1 to pets_product_records.len) + var/datum/stored_item/vending_product/I = pets_product_records[key] + listed_products.Add(list(list( "key" = key, "name" = I.item_name, @@ -1334,7 +1460,7 @@ data["category_clothing"] = category_clothing data["category_misc"] = category_misc data["category_drinks"] = category_drinks - + data["category_pets"] = category_pets ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) if(!ui) @@ -1366,6 +1492,9 @@ if("selected_drinks") currently_selecting = "cat_drinks" prize_payout_mode = category_drinks + if("selected_pets") + currently_selecting = "cat_pets" + prize_payout_mode = category_pets else currently_selecting = null prize_payout_mode = null @@ -1422,6 +1551,16 @@ var/datum/stored_item/vending_product/R = drinks_product_records[key] currently_selecting = null + if(R.price <= 0) + vend(R, usr) + else + currently_vending = R + status_message = "Please insert chips to pay for the prize!" + status_error = 0 + if("cat_pets") + var/datum/stored_item/vending_product/R = pets_product_records[key] + currently_selecting = null + if(R.price <= 0) vend(R, usr) else diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm new file mode 100644 index 0000000000..48f4e42a74 --- /dev/null +++ b/code/game/objects/items/weapons/grenades/spawnergrenade_ch.dm @@ -0,0 +1,115 @@ +/obj/item/weapon/grenade/spawnergrenade/casino + + desc = "It is set to detonate in 5 seconds. It will release a goose that has been won from the golden goose casino!" + name = "Casino Creature Container (Goose)" + icon = 'icons/obj/grenade_ch.dmi' + icon_state = "casino" + item_state = "casino" + origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2) + spawner_type = /mob/living/simple_mob/animal/space/goose/domesticated + + +// Detonate now just handles the two loops that query for people in lockers and people who can see it. +/obj/item/weapon/grenade/spawnergrenade/casino/detonate() + + if(spawner_type && deliveryamt) + var/turf/T = get_turf(src) + playsound(T, 'sound/effects/phasein.ogg', 100, 1) + + for(var/i=1, i<=deliveryamt, i++) + var/atom/movable/x = new spawner_type(T) + if(prob(50)) + for(var/j = 1, j <= rand(1, 3), j++) + step(x, pick(NORTH,SOUTH,EAST,WEST)) + qdel(src) + return + +/obj/item/weapon/grenade/spawnergrenade/casino/goat + desc = "It is set to detonate in 5 seconds. It will release a goat that has been won from the golden goose casino!" + name = "Casino Creature Container (Goat)" + spawner_type = /mob/living/simple_mob/animal/goat + +/obj/item/weapon/grenade/spawnergrenade/casino/armadillo + desc = "It is set to detonate in 5 seconds. It will release a armadillo that has been won from the golden goose casino!" + name = "Casino Creature Container (Armadillo)" + spawner_type = /mob/living/simple_mob/animal/passive/armadillo + +/obj/item/weapon/grenade/spawnergrenade/casino/cat + desc = "It is set to detonate in 5 seconds. It will release a cat that has been won from the golden goose casino!" + name = "Casino Creature Container (Cat)" + spawner_type = /mob/living/simple_mob/animal/passive/cat + +/obj/item/weapon/grenade/spawnergrenade/casino/chicken + desc = "It is set to detonate in 5 seconds. It will release a chicken that has been won from the golden goose casino!" + name = "Casino Creature Container (Chicken)" + spawner_type = /mob/living/simple_mob/animal/passive/chicken + +/obj/item/weapon/grenade/spawnergrenade/casino/cow + desc = "It is set to detonate in 5 seconds. It will release a cow that has been won from the golden goose casino!" + name = "Casino Creature Container (Cow)" + spawner_type = /mob/living/simple_mob/animal/passive/cow + +/obj/item/weapon/grenade/spawnergrenade/casino/corgi + desc = "It is set to detonate in 5 seconds. It will release a corgi that has been won from the golden goose casino!" + name = "Casino Creature Container (Corgi)" + spawner_type = /mob/living/simple_mob/animal/passive/dog/corgi + +/obj/item/weapon/grenade/spawnergrenade/casino/fox + desc = "It is set to detonate in 5 seconds. It will release a fox that has been won from the golden goose casino!" + name = "Casino Creature Container (Fox)" + spawner_type = /mob/living/simple_mob/animal/passive/fox + +/obj/item/weapon/grenade/spawnergrenade/casino/lizard + desc = "It is set to detonate in 5 seconds. It will release a lizard that has been won from the golden goose casino!" + name = "Casino Creature Container (Lizard)" + spawner_type = /mob/living/simple_mob/animal/passive/lizard + +/obj/item/weapon/grenade/spawnergrenade/casino/penguin + desc = "It is set to detonate in 5 seconds. It will release a penguin that has been won from the golden goose casino!" + name = "Casino Creature Container (Penguin)" + spawner_type = /mob/living/simple_mob/animal/passive/penguin + +/obj/item/weapon/grenade/spawnergrenade/casino/snake + desc = "It is set to detonate in 5 seconds. It will release a snake that has been won from the golden goose casino!" + name = "Casino Creature Container (Snake)" + spawner_type = /mob/living/simple_mob/animal/passive/snake + +/obj/item/weapon/grenade/spawnergrenade/casino/yithian + desc = "It is set to detonate in 5 seconds. It will release a yithian that has been won from the golden goose casino!" + name = "Casino Creature Container (Yithian)" + spawner_type = /mob/living/simple_mob/animal/passive/yithian + +/obj/item/weapon/grenade/spawnergrenade/casino/tindalos + desc = "It is set to detonate in 5 seconds. It will release a tindalos that has been won from the golden goose casino!" + name = "Casino Creature Container (Tindalos)" + spawner_type = /mob/living/simple_mob/animal/passive/tindalos + +/obj/item/weapon/grenade/spawnergrenade/casino/fennec + desc = "It is set to detonate in 5 seconds. It will release a fennec that has been won from the golden goose casino!" + name = "Casino Creature Container (Fennec)" + spawner_type = /mob/living/simple_mob/vore/fennec + +/obj/item/weapon/grenade/spawnergrenade/casino/redpanda + desc = "It is set to detonate in 5 seconds. It will release a red panda that has been won from the golden goose casino!" + name = "Casino Creature Container (Red panda)" + spawner_type = /mob/living/simple_mob/vore/redpanda + +/obj/item/weapon/grenade/spawnergrenade/casino/horse + desc = "It is set to detonate in 5 seconds. It will release a horse that has been won from the golden goose casino!" + name = "Casino Creature Container (Horse)" + spawner_type = /mob/living/simple_mob/vore/horse + +/obj/item/weapon/grenade/spawnergrenade/casino/otie + desc = "It is set to detonate in 5 seconds. It will release a otie that has been won from the golden goose casino!" + name = "Casino Creature Container (Otie)" + spawner_type = /mob/living/simple_mob/otie/friendly + +/obj/item/weapon/grenade/spawnergrenade/casino/otie/chubby + desc = "It is set to detonate in 5 seconds. It will release a chonker otie that has been won from the golden goose casino!" + name = "Casino Creature Container (Well feed Otie)" + spawner_type = /mob/living/simple_mob/otie/friendly/chubby + +/obj/item/weapon/grenade/spawnergrenade/casino/zorgoia + desc = "It is set to detonate in 5 seconds. It will release a zorgoia that has been won from the golden goose casino!" + name = "Casino Creature Container (Zorgoia)" + spawner_type = /mob/living/simple_mob/otie/zorgoia/friendly \ No newline at end of file diff --git a/code/game/objects/items/weapons/id cards/CH_ids.dm b/code/game/objects/items/weapons/id cards/CH_ids.dm index 1e8050315d..2d023bb626 100644 --- a/code/game/objects/items/weapons/id cards/CH_ids.dm +++ b/code/game/objects/items/weapons/id cards/CH_ids.dm @@ -11,8 +11,16 @@ desc = "An ID card for an employee of the golden goose casino with extra access to prize booth." access = list(160, 200) +/obj/item/weapon/card/id/casino + name = "casino employee id" + desc = "An ID card for an employee of the golden goose casino." + icon_state = "ch_casino" + item_state = "gold_id" + + access = list(160, 200, 201) + /obj/item/weapon/card/id/casino/manager name = "casino manager id" desc = "An ID card for the manager of the golden goose casino." icon_state = "ch_casino_manager" - access = list(160, 200, 300) \ No newline at end of file + access = list(160, 200, 201, 300) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 6886a08a3c..6805bb21ab 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -53,6 +53,7 @@ /mob/living/simple_mob/vore/aggressive/mimic, /mob/living/simple_mob/vore/aggressive/rat, /mob/living/simple_mob/vore/aggressive/rat/tame, + /mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit // /mob/living/simple_mob/otie;0.5 )) return ..() diff --git a/code/modules/clothing/head/misc_ch.dm b/code/modules/clothing/head/misc_ch.dm index 34927aed81..75c22adadd 100644 --- a/code/modules/clothing/head/misc_ch.dm +++ b/code/modules/clothing/head/misc_ch.dm @@ -19,4 +19,27 @@ icon_state = "wahcap" item_state_slots = list(slot_r_hand_str = "wahcap", slot_l_hand_str = "wahcap") icon = 'icons/obj/clothing/hats_ch.dmi' - icon_override = 'icons/mob/head_ch.dmi' \ No newline at end of file + icon_override = 'icons/mob/head_ch.dmi' + + +/obj/item/clothing/head/crown //Generic crown doesnt exist, no sprites + icon = 'icons/obj/clothing/hats_ch.dmi' + icon_override = 'icons/mob/head_ch.dmi' + icon_state = "crown" + item_state = "crown" + name = "crown" + desc = "A crown, it's pretty." + body_parts_covered = 0 + +/obj/item/clothing/head/crown/goose_king + name = "Crown of the golden goose king" + desc = "It's the crown given to the goose king from the golden goose casino, what an honor!" + icon_state = "goose_king" + item_state = "goose_king" + + +/obj/item/clothing/head/crown/goose_queen + name = "Crown of the golden goose queen" + desc = "It's the crown given to the goose queen from the golden goose casino, what an honor!" + icon_state = "goose_queen" + item_state = "goose_queen" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm index 6bae511c42..e18afe82b6 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents_ch.dm @@ -546,15 +546,35 @@ return M.adjustToxLoss(-0.5 * removed) +/datum/reagent/drink/highpower + name = "The High power" + id = "highpower" + description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + taste_description = "copper, ozone, and pain" + color = "#a2f563" + + glass_name = "highpower" + glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." + +/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_DIONA) + return + if(prob(5)) + M.say("!skin's crackles with energy and seems to be in pain.") + M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30) + M.AdjustWeakened(3) //Getting sapped makes the victim fall + M.Stun(3) + M.add_chemical_effect(CE_SPEEDBOOST, 1) + /datum/reagent/ethanol/coffee/jackbrew - name = "\improper Jack's brew" + name = "Rush hour" id = "jackbrew" description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." taste_description = "wishing you could give up on the day" color = "#4C3100" strength = 15 - glass_name = "Jack's brew" + glass_name = "Rush hour" glass_desc = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." /datum/reagent/ethanol/coffee/jackbrew/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) @@ -566,7 +586,7 @@ M.nutrition = (M.nutrition - (removed * 2)) //Sadly this movement starts burning food in higher doses. ..() if(prob(5)) - M.emote(pick("twitch", "blink_r", "shiver", "weh")) + M.emote(pick("twitch", "blink_r", "shiver", "weh", "weh", "weh")) // weh - Jack M.add_chemical_effect(CE_SPEEDBOOST, 1) /datum/reagent/ethanol/bookwyrm @@ -618,26 +638,6 @@ M.sleeping = max(M.sleeping, 20) M.drowsyness = max(M.drowsyness, 60) -/datum/reagent/drink/highpower - name = "The High power" - id = "highpower" - description = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." - taste_description = "copper, ozone, and pain" - color = "#a2f563" - - glass_name = "highpower" - glass_desc = "A strange, softly crackling drink, smelling just like lightning's just struck, twice. It's rather difficult to make this without busting the lights." - -/datum/reagent/drink/highpower/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) - if(alien == IS_DIONA) - return - if(prob(5)) - M.say("!skin's crackles with energy and seems to be in pain.") - M.custom_pain("You feel painful electricity running through your body, like adrenaline, and like your blood's boiling!",30) - M.AdjustWeakened(3) //Getting sapped makes the victim fall - M.Stun(3) - M.add_chemical_effect(CE_SPEEDBOOST, 1) - /datum/reagent/ethanol/flapper name = "Flapper" id = "flapper" diff --git a/icons/mob/head_ch.dmi b/icons/mob/head_ch.dmi index fe9dc6c08a..349ad43760 100644 Binary files a/icons/mob/head_ch.dmi and b/icons/mob/head_ch.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index ab0d8b988d..eb6aaa2f0b 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/casino_ch.dmi b/icons/obj/casino_ch.dmi index db620074a1..fa3fd57f38 100644 Binary files a/icons/obj/casino_ch.dmi and b/icons/obj/casino_ch.dmi differ diff --git a/icons/obj/clothing/hats_ch.dmi b/icons/obj/clothing/hats_ch.dmi index 24322d439e..6fa68d8291 100644 Binary files a/icons/obj/clothing/hats_ch.dmi and b/icons/obj/clothing/hats_ch.dmi differ diff --git a/icons/obj/grenade_ch.dmi b/icons/obj/grenade_ch.dmi new file mode 100644 index 0000000000..074bd49b90 Binary files /dev/null and b/icons/obj/grenade_ch.dmi differ diff --git a/maps/southern_cross/southern_cross-casino.dmm b/maps/southern_cross/southern_cross-casino.dmm index a70d39b6dd..cebc40210a 100644 --- a/maps/southern_cross/southern_cross-casino.dmm +++ b/maps/southern_cross/southern_cross-casino.dmm @@ -16,7 +16,7 @@ "ap" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/grass,/area/casino/casino_ship) "aq" = (/obj/machinery/slot_machine,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "ar" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/table/gamblingtable,/obj/structure/wheel_of_fortune{pixel_x = -6},/turf/simulated/floor/carpet/turcarpet,/area/casino/casino_ship) -"as" = (/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/structure/closet,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) +"as" = (/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/gentlesuit/skirt,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/suit_jacket,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/sundress,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/structure/closet,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/sunglasses/aviator,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "at" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/grass,/area/casino/casino_ship) "au" = (/turf/simulated/floor/carpet/gaycarpet,/area/casino/casino_ship) "av" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) @@ -40,7 +40,7 @@ "aN" = (/obj/machinery/vending/snack,/turf/simulated/floor/carpet/bcarpet,/area/casino/casino_ship) "aO" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; name = "Casino Airlock"},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship) "aP" = (/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) -"aQ" = (/obj/machinery/door/airlock{name = "Custodial Closet"; req_access = list(26,160)},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) +"aQ" = (/obj/machinery/door/airlock{name = "Custodial Closet"; req_access = list(160)},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "aR" = (/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) "aS" = (/obj/structure/table/standard{name = "plastic table frame"},/turf/simulated/shuttle/floor/yellow,/area/shuttle/casino/ship) "aT" = (/obj/structure/bed/chair/shuttle{icon_state = "shuttle_chair"; dir = 8},/turf/simulated/shuttle/floor/yellow,/area/shuttle/casino/ship) @@ -73,7 +73,7 @@ "bu" = (/obj/structure/curtain/open/bed,/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) "bv" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/grass,/area/casino/casino_ship) "bw" = (/obj/structure/bed/chair/oldsofa{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) -"bx" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering center"; req_access = list(10,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) +"bx" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering center"; req_access = list(160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "by" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{id = "CasinoEmergency2"; layer = 3.5; name = "Casino emergency shutter"},/turf/simulated/floor,/area/casino/casino_ship) "bz" = (/obj/machinery/door/airlock/silver{name = "Casino crew toilet"; req_one_access = newlist()},/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/cockpit) "bA" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/grass,/area/casino/casino_ship) @@ -84,7 +84,7 @@ "bF" = (/obj/machinery/embedded_controller/radio/simple_docking_controller{frequency = 1380; id_tag = "casino_shuttle_bay"; name = "shuttle bay controller"; pixel_x = -32; tag_door = "casino_shuttle_bay_airlock"},/turf/simulated/floor/carpet/gaycarpet,/area/casino/casino_ship) "bG" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "bH" = (/obj/machinery/computer/shuttle_control{dir = 4; name = "Casino shuttle control console"; shuttle_tag = "Casino"},/turf/simulated/shuttle/floor/yellow,/area/shuttle/casino/ship) -"bI" = (/obj/structure/table/marble,/obj/machinery/door/window/westright{layer = 3.1},/obj/machinery/door/blast/shutters{dir = 4; id = "Casinoboth"; layer = 3.2; name = "Exchange booth shutters"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) +"bI" = (/obj/structure/table/marble,/obj/machinery/door/window/westleft{layer = 3.1; req_access = list(200)},/obj/machinery/door/blast/shutters{dir = 4; id = "Casinoboth"; layer = 3.2; name = "Exchange booth shutters"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "bJ" = (/obj/structure/bed/chair/shuttle{icon_state = "shuttle_chair"; dir = 4},/turf/simulated/shuttle/floor/yellow,/area/shuttle/casino/ship) "bK" = (/obj/structure/table/gamblingtable,/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) "bL" = (/obj/structure/flora/pottedplant/smalltree,/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) @@ -138,7 +138,7 @@ "cH" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/casino/casino_ship) "cI" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/grass,/area/casino/casino_ship) "cJ" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) -"cK" = (/obj/structure/table/marble,/obj/machinery/door/window/westleft{layer = 3.1},/obj/machinery/door/blast/shutters{dir = 4; id = "Casinoboth"; layer = 3.2; name = "Exchange booth shutters"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) +"cK" = (/obj/structure/table/marble,/obj/machinery/door/window/westright{layer = 3.1; req_access = list(200)},/obj/machinery/door/blast/shutters{dir = 4; id = "Casinoboth"; layer = 3.2; name = "Exchange booth shutters"},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "cL" = (/obj/structure/table/marble,/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) "cM" = (/obj/item/weapon/storage/secure/safe{pixel_x = 35},/obj/structure/bed/chair/office/dark{dir = 8},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "cN" = (/obj/machinery/door/airlock/silver{name = "Casino crew bathrooms"; req_one_access = newlist()},/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/cockpit) @@ -197,7 +197,7 @@ "dO" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/rack,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/obj/structure/window/reinforced,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "dP" = (/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/suit/space/emergency,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "dQ" = (/obj/structure/window/reinforced,/obj/structure/table/rack,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/obj/item/clothing/mask/breath/emergency,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) -"dR" = (/obj/structure/table/marble,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship/cockpit) +"dR" = (/obj/structure/table/marble,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/device/encryptionkey/talon,/obj/item/clothing/head/crown/goose_king,/obj/item/clothing/head/crown/goose_queen,/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship/cockpit) "dS" = (/obj/structure/table/marble,/obj/machinery/button/remote/blast_door{id = "Casinoboth"; name = "Both Shutters"; pixel_x = 26; pixel_y = 8; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{id = "Casinoprizes"; name = "Prize Shutters"; pixel_x = 26; pixel_y = -8; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{id = "CasinoEmergency2"; name = "Middle emergency shutters"; pixel_x = 0; pixel_y = -24; req_access = list(160)},/obj/item/weapon/paper_bin{pixel_y = 6},/obj/item/weapon/pen/blue,/obj/item/weapon/folder/red,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "dT" = (/obj/structure/window/reinforced,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship) "dU" = (/obj/machinery/door/airlock/silver{name = "Casino manager bathroom"; req_one_access = newlist()},/turf/simulated/floor/tiled,/area/casino/casino_ship/cockpit) @@ -236,9 +236,9 @@ "eB" = (/obj/structure/closet/secure_closet/paramedic,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "eC" = (/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "eD" = (/obj/machinery/vending/medical,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) -"eE" = (/obj/structure/table/glass,/obj/machinery/recharger,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) -"eF" = (/obj/item/device/defib_kit,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) -"eG" = (/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = list(5,160); req_one_access = list()},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) +"eE" = (/obj/structure/table/glass,/obj/machinery/recharger,/obj/item/weapon/backup_implanter,/obj/item/weapon/backup_implanter,/obj/item/weapon/backup_implanter,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) +"eF" = (/obj/item/device/defib_kit,/obj/machinery/iv_drip,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) +"eG" = (/obj/machinery/door/airlock/glass_medical{name = "Medbay"; req_access = list(160); req_one_access = list()},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "eH" = (/obj/structure/table/bench/marble,/turf/simulated/floor/grass,/area/casino/casino_ship/dorms) "eI" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/window/reinforced{dir = 1},/obj/structure/curtain/open/shower/engineering,/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/dorms) "eJ" = (/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/dorms) @@ -259,7 +259,7 @@ "eY" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 2; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northleft{layer = 2.9; name = "EVA suit storage"; req_access = list(5)},/obj/item/device/suit_cooling_unit,/obj/item/weapon/rig/medical/equipped,/obj/item/weapon/tank/oxygen,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "eZ" = (/obj/structure/table/glass,/obj/machinery/cell_charger,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "fa" = (/obj/structure/table/glass,/obj/item/weapon/storage/firstaid/o2{pixel_x = 8; pixel_y = 8},/obj/item/weapon/storage/firstaid/toxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/adv{pixel_x = -4; pixel_y = -4},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) -"fb" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) +"fb" = (/obj/machinery/computer/transhuman/resleeving{icon_state = "computer"; dir = 1},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "fc" = (/obj/machinery/sleep_console{dir = 4},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "fd" = (/obj/machinery/sleeper{dir = 4},/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "fe" = (/obj/structure/table/glass,/obj/item/weapon/soap,/obj/item/weapon/soap,/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/cockpit) @@ -303,7 +303,7 @@ "fQ" = (/obj/structure/table/marble,/obj/item/weapon/card/id/casino,/obj/item/weapon/card/id/casino,/obj/item/weapon/card/id/casino,/obj/item/weapon/card/id/casino,/obj/item/weapon/card/id/casino/booth,/obj/item/weapon/card/id/casino/booth,/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship/cockpit) "fR" = (/obj/structure/sink{pixel_x = 16; pixel_y = 24},/obj/structure/toilet{dir = 4},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "fS" = (/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"fT" = (/obj/machinery/door/airlock/security,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"fT" = (/obj/machinery/door/airlock/security{name = "Cell 1"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "fU" = (/obj/structure/sink{pixel_x = -16; pixel_y = 24},/obj/structure/toilet{dir = 8},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "fV" = (/obj/structure/table/reinforced,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "fW" = (/obj/structure/closet/secure_closet/security,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) @@ -321,7 +321,7 @@ "gi" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/grass,/area/casino/casino_ship) "gj" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/casino/casino_ship/cockpit) "gk" = (/obj/structure/bed/chair/comfy/purp{dir = 8},/turf/simulated/floor/wood,/area/casino/casino_ship/cockpit) -"gl" = (/obj/machinery/door/airlock/security{req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"gl" = (/obj/machinery/door/airlock/security{name = "Cell 2"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "gm" = (/obj/machinery/shower{dir = 4; icon_state = "shower"; pixel_x = 5; pixel_y = 0},/obj/structure/curtain/open/shower/engineering,/obj/structure/window/reinforced,/turf/simulated/floor/tiled/freezer,/area/casino/casino_ship/dorms) "gn" = (/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship/cockpit) "go" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/flora/tree/palm,/turf/simulated/floor/grass,/area/casino/casino_ship) @@ -404,19 +404,20 @@ "hN" = (/obj/machinery/computer/shuttle_control{dir = 8; name = "Casino shuttle control console"; shuttle_tag = "Casino"},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship/cockpit) "hO" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "hP" = (/turf/unsimulated/wall,/area/space) -"hQ" = (/obj/machinery/door/airlock/security{name = "Cell 1"; req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"hR" = (/obj/machinery/button/remote/blast_door{id = "Casinobar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0; req_access = list(25,160)},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) -"hS" = (/obj/machinery/door/airlock/security{name = "Cell 2"; req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hQ" = (/obj/machinery/door/airlock/security{name = "Holding cells"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hR" = (/obj/machinery/button/remote/blast_door{id = "Casinobar"; name = "Bar Shutters"; pixel_x = -26; pixel_y = 0; req_access = list(160)},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/carpet/purcarpet,/area/casino/casino_ship) +"hS" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "hT" = (/obj/machinery/door/airlock/silver{name = "Casino manager sleeping quarters"; req_one_access = list(300)},/turf/simulated/floor/wood,/area/casino/casino_ship/cockpit) -"hU" = (/obj/machinery/door/airlock/security{name = "Holding cells"; req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"hV" = (/obj/machinery/door/airlock/security{name = "Equipment Storage"; req_access = list(2,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"hW" = (/obj/machinery/door/airlock/security{name = "Evidence room"; req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"hX" = (/obj/machinery/door/airlock/security{name = "Interrogation room"; req_access = list(1,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hU" = (/obj/machinery/door/airlock/security{req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hV" = (/obj/machinery/door/airlock/security{name = "Evidence room"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hW" = (/obj/machinery/door/airlock/security{name = "Interrogation room"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"hX" = (/obj/machinery/door/airlock/security{req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "hY" = (/obj/machinery/door/airlock/multi_tile/glass{dir = 2; name = "Security wing"},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "hZ" = (/obj/machinery/recharge_station,/turf/simulated/floor/carpet/gaycarpet,/area/casino/casino_ship) +"ia" = (/obj/machinery/transhuman/resleever,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "ib" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/southright{layer = 2.9; req_access = list(2,160)},/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/head/helmet/combat,/obj/item/clothing/head/helmet/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/suit/armor/combat,/obj/item/clothing/suit/armor/combat,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "ic" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/window/brigdoor/southleft{layer = 2.9; req_access = list(2,160)},/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/gloves/arm_guard/combat,/obj/item/clothing/head/helmet/combat,/obj/item/clothing/head/helmet/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/shoes/leg_guard/combat,/obj/item/clothing/suit/armor/combat,/obj/item/clothing/suit/armor/combat,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) -"id" = (/obj/machinery/door/airlock/security{name = "Combat Equipment Storage"; req_access = list(2,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) +"id" = (/obj/machinery/clonepod/transhuman/full,/turf/simulated/floor/tiled/white,/area/casino/casino_ship/wing_left) "ie" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/northright{req_access = list(2,160)},/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/obj/item/weapon/gun/energy/laser,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "if" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/window/brigdoor/northleft{req_access = list(2,160)},/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/gun/energy/ionrifle,/obj/item/weapon/gun/energy/plasmastun,/obj/item/weapon/gun/energy/plasmastun,/obj/item/weapon/gun/energy/gun/burst,/obj/item/weapon/gun/energy/gun/burst,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "ig" = (/obj/structure/table/rack,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/northright{req_access = list(2,160)},/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/shotgun/pump/combat,/obj/item/weapon/gun/projectile/garand,/obj/item/weapon/gun/projectile/garand,/obj/item/weapon/gun/projectile/automatic/p90,/obj/item/weapon/gun/projectile/automatic/p90,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) @@ -495,6 +496,7 @@ "jB" = (/obj/machinery/telecomms/relay/preset/casino,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_left) "jC" = (/obj/structure/window/reinforced,/obj/structure/table/gamblingtable,/turf/simulated/floor/carpet/turcarpet,/area/casino/casino_ship) "jD" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/table/gamblingtable,/turf/simulated/floor/carpet/turcarpet,/area/casino/casino_ship) +"jE" = (/obj/machinery/door/airlock/security{name = "Combat Equipment Storage"; req_access = list(201,160); req_one_access = list()},/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right) "jJ" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/grass,/area/casino/casino_ship) "jK" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/casino/casino_ship/dorms) "jL" = (/obj/structure/simple_door/wood{name = "Garden"},/turf/simulated/floor/carpet/oracarpet,/area/casino/casino_ship/dorms) @@ -569,28 +571,28 @@ aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiajabababababababaDaDaDaDaDaDabeoepeqaDerabanauauauauauauauauauauauauauauauauauauauauauauauaudnanananancdanananananananananbSiHduesetdudDeuduesetdudDevduesetdudDewdudpfKfGfGfGdogVgVaEjKeyadfxezenenezdzeAdzeAdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiajabeBeCeDeEeFabeGababeKaDababababababababadiPauadadadadadadadadadcmaLaVbjaPaRaPboaVaVbpauaujgjhjrjljtbfjljmjnjojhjpanananatcedueIeJfzdDeLdueIeJfzdDeLdueIeJfzdDeLduexfKfGfGfGdogVgVgVdoeTadaHeMeneneMdzbzdzbzdzdzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiajabeOePePePePePePePabauauauauauauauauauauauauaucscbadaRaZadaRaZadcpbwbnaRaRaRaRaRaRbncXauauauauauauauauauauauauauauauauauauaududududueQdududududueRdududududueSdudueTfKfGfGfGdogVaEgVfHaCadaHeMeneneVdzeWeWeWdzeXeWeXdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababeYeZfafbePfcfdePabauauauauauauauauauauauauaucncoadaRbqadaRbqadbTcYaRaRaRaRaRaRaRaRcXbdauauauauauauauauauauauauauauauauauauaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbSduexbgfGfGfGdoftdodododoadfIeVenenencNeWeWeWdceWeWeWfedzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabababeYeZfafbiaidfcfdabauauauauauauauauauauauauaucncoadaRbqadaRbqadbTcYaRaRaRaRaRaRaRaRcXbdauauauauauauauauauauauauauauauauauauaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbSduexbgfGfGfGdoftdodododoadfIeVenenencNeWeWeWdceWeWeWfedzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababababababababababbFauadadadanaGaHaHaKanauaucqawadbuadadbuadadaWaRaRaRaRaRaRaRaRaRcZadjeanananananananananananananananauauaOaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbUdudojKfGdododododoeUdodpadfJenenenffdzfgeWfhdzfieWfidzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaddedeadaaadanaGaHaHaKanauaucnawadaRaRaRaRaReNaRaRaRaRaRbKbKbKaRaRbYbZcianiYiXiXiZaniYiXiXiZanbsbtbvanauauadbWcEcEcEbbdfbVcEcEcEbVbXaAhZaBaBbBdueydofGdoeUdodofCdododoadaddzbidzdzdzdzdzdzdzdzdzdzdzdzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbEbDbDbEbEbEbDdkdkaFbDgTananananananauauiQiRadadadadadadadbLclclaRaRbKhibKaRaRbYbYjAanczcWdgcAanczcWdgcAanbAbPbQanauauadadadadhdhehehehfadadadadadadaBaBbSdudpexfGdodoeyeTdojKfAfCadaNbmbmbmdadZdbdndadZdbbSdzfmfnfofodzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbDbJaSaTbJaSaTbObOaXbDaUhGanaGaHaHaKanauauanedecdsadcucRiLadcScSddclaRbKbKbKaRaRbYbYjAbRjajbjbjcbRjajbjbjcbRbSawbTanauauanbrbhadcFdVgWcQcTadiCbeixiyadaBaBfldududujLdudududududududuadefbmbmbmdwdZeedtdwdZeefldzfmfpfpfofqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGanaGaHaHaKanauauananananadhRaRaRaRaRaRddclaRaRaRaRaRaRbYbYjAjsbtdfbVbWbXbtbVbXbVbtccawjxanauauaucKcMadcVdThgdTcUadiEananizadaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBadfrbmbmbmbmbmbmbmbmbmbmbmdzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGanaGaHaHaKanauauananananadhRaRaRaRaRaRddclaRaRaRaRaRaRbYbYjAjsbtdfbVbWbXbtbVbXbVbtccawjxanauauaubIcMadcVdThgdTcUadiEananizadaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBadfrbmbmbmbmbmbmbmbmbmbmbmdzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEbHhzhcbObObObObObObObObObDaUhGananananananauauananananfXaRaRaRcLcLaRddaRaRaRaRaRaRaRbYbYarjyawawawbPcacbawawawccjycajzanauauaubCaniianananananiiananananhCaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBfLbmbmbmbmbmbmbmbmbmbmbmbmfjfmfpfEfFfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGancvcwcwcOanauauananananadcLaRaRaRaRaRddclaRaRaRaRaRaRbYbYjAdicedhcfcgcgchcfdicfceccawjxanauauaubIcMadgXdWhhdWdXadiBananikadaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBdzfsbmbmbmbmbmbmbmbmbmbmbmdzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGancvcwcwcOanauauananananadcLaRaRaRaRaRddclaRaRaRaRaRaRbYbYjAdicedhcfcgcgchcfdicfceccawjxanauauaucKcMadgXdWhhdWdXadiBananikadaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBdzfsbmbmbmbmbmbmbmbmbmbmbmdzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbDbJaSaTbJaSaTbOdCdCbDaUhGananananananauauanebeajeadcLcPaYadijijddclaRbKbKbKaRaRbYbYjAbRayaMaMctbRayaMaMctbRbAawbQanauauanbrdSadgYdYgZhahbadiAiGiIiFadaBaBcHadadadgAadadadadadadadadadfubmbmbmdadZdbgpdadZdbfvdzfmfpfpfofNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbEbDbDbEbEbEbDbDbDbDbDilanaGaHaHaKanauauiSiTadadadadadadadbLclclaRaRbKhibKaRaRbYbYjAanczcWdgcAanczcWdgcAanbSbPbTanauauadadadadhdhehehehfadadadadadadaBaBcIadaxfMfMfMgwadhDgLgLgLgLadfwbmbmbmdwdZeegsdwdZeebSdzfmfnfofodzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadanaGaHaHaKanauaucsawadaRaRaRaRaRhMaRaRaRaRaRbKbKbKaRaRbYjCjDanhuiXiXhyanhuiXiXhyancjchckanauauadcedrdrdrcgcfdqdrdrdrcgcegthZaBaBcsadgqfMfMfMgxadgKgKgKgKgLadaddzfDdzdzdzdzdzdzdzdzdzdzdzdzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOfOananananananauaucsawadbuadadbuadadcxaRaRaRaRaRaRaRaRaRekadjeanananananananananananananananauauaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbSadgqfMfMfMfMgBgKgKgKgKgLadghfmfmfmfndziNfPiJfmfmfmdUeWeWeldzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOfRfShQfShSfSfUfOfVivfWfWfWfOanaGaHaHaKanauaucqcoadaRbqadaRbqadcyfkaRaRaRaRaRaRaRaRcXhmauauauauauauauauauauauauauauauauauauaOaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbUadgqfMfMfMfMadhDgLgLgLgLadfMfpfpfpfmhTfmfmfmfmfmfYdzfgfZdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOfRfSfTfSglfSfUfOfVivfWfWfWfOanaGaHaHaKanauaucqcoadaRbqadaRbqadcyfkaRaRaRaRaRaRaRaRcXhmauauauauauauauauauauauauauauauauauauaOaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBaBbUadgqfMfMfMfMadhDgLgLgLgLadfMfpfpfpfmhTfmfmfmfmfmfYdzfgfZdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOgcfSgdfSgdfSgcfOfVfSfSfSfSfOanaGaHaHaKanauaucrbPadaRaZadaRaZadcpbwbnaRaRaRaRaRaRbncXauauauauauauauauauauauauauauauauauauaududududugfdududududuggdududududugedudugyfMfMfMfMadadadadadadadfMfpfpfpfmdzfmfmfmgjgkdzdzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfOfOfOhUfOfOfOfOfOhVfOfOfOfOfOfOfOfOfOadiPauadadadadadadadadadcBhFiniojjaRjjipininjdauaujqjrjJjmjkbfjnjhjljtjmjuananancCbtdugmeJfzdDeLdugmeJfzdDeLdugmeJfzdDeLdugzfMfMfMfMfBgugvgvgvgiadfMfpfpfpfmdzgngngngrgCdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfVgDfOfSfSgEgdgFgGfSfSfSglfSfSfSfSfSfSanauauauauauauauauauauauauauauauauauauauauauauauaujvananananananananananananananbScDduesetdudDgHduesetdudDgIduesetdudDgJdufBfBfBfBfBfBgugvgvgvgoadfMdRfQgMfmdzgNgOgPdzgQdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfVfShWfSfSfShXfSfSfSfSfSfOgRgSfSfSfShYanauauauauauauauauauauauauauauauauauauauauauauauaujwananananananananananananananbAcodududududDdFdududududDdFdududududDdFdugugugugugugugugvgvgvbAadfMhkgUhNfmdzdzdzgQdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOhnfSfOfShohphqfShrhshpfSfThrhtiUiUiVadananananananananananananananananananananananananananananananananananananananananapawdudFdDdDdDdDdudFdDdDdDdDdudFdDdDdDdDdugvgvgvgvgvgvgvgvgvgvgoadfMfmiOfmfmdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfOfOfOhQfOfOfOfOfOhSfOfOfOfOfOfOfOfOfOadiPauadadadadadadadadadcBhFiniojjaRjjipininjdauaujqjrjJjmjkbfjnjhjljtjmjuananancCbtdugmeJfzdDeLdugmeJfzdDeLdugmeJfzdDeLdugzfMfMfMfMfBgugvgvgvgiadfMfpfpfpfmdzgngngngrgCdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfVgDfOfSfSgEgdgFgGfSfSfShUfSfSfSfSfSfSanauauauauauauauauauauauauauauauauauauauauauauauaujvananananananananananananananbScDduesetdudDgHduesetdudDgIduesetdudDgJdufBfBfBfBfBfBgugvgvgvgoadfMdRfQgMfmdzgNgOgPdzgQdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfVfShVfSfSfShWfSfSfSfSfSfOgRgSfSfSfShYanauauauauauauauauauauauauauauauauauauauauauauauaujwananananananananananananananbAcodududududDdFdududududDdFdududududDdFdugugugugugugugugvgvgvbAadfMhkgUhNfmdzdzdzgQdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOhnfSfOfShohphqfShrhshpfShXhrhtiUiUiVadananananananananananananananananananananananananananananananananananananananananapawdudFdDdDdDdDdudFdDdDdDdDdudFdDdDdDdDdugvgvgvgvgvgvgvgvgvgvgoadfMfmiOfmfmdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOhnfSfOhvfVfShwfShrhshphxfOimgdiWiUiVadaniYiXiXiZaniYiXiXiXiZancdcdcdcdcdananananananananananananananancdcdcdcdcdanananbAawdudNdDdDdDdDdudNdDdDdDdDdudNdDdDdDdDdugvgvgvgvgvgvgvgvgvgvapadjiiMdzhAhBdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfOfOfOfOfOfOfOfSfSfSfShxfOfOfOadadadadancziXiXcAancziXiXiXcAancdavavavcdancdcdcdcdcdananancdcdcdcdcdancdavavavcdanananbUcodudDdDdEdFdGdudDdDdEdFdGdudDdDdEdFdGdugvgvgvgvgvgvgvgvgvgvgoadaddzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOitiuhEibicfSfOfShHhIhJhKfOfOfOadadadadjejajbjbjcazcziXiXiXcAancdhjiwhlcdancdavavavcdananancdavavavcdancdhjiwhlcdananbabScDdudvdxdxdxdydudvdxdxdxdydudvdxdxdxdyducGdjdjdjdjdjdjdjdjdjdmadadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfSfSfSfSfSfSidfShLfOfOfOfOaaaaaaaaaaadiqiriririsadjajbjbjbjcbacdiXavancdancdhjiwhlcdananancdhjiwhlcdancdanaviXcdananadiqisadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfSfSfSfSfSfSjEfShLfOfOfOfOaaaaaaaaaaadiqiriririsadjajbjbjbjcbacdiXavancdancdhjiwhlcdananancdhjiwhlcdancdanaviXcdananadiqisadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOieifhOigihfSfOfOfOfOaaaaaaaaaaaaaaaaaaaaaaaaaaaaadiqiriririsadiqiriririsadcdiXavancdanbaancdanaviXcdadiqiriririririsadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOfOfOfOfOfOfOfOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadiqiriririsadadadiqiriririsadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa diff --git a/nano/templates/Casino_prize_dispenser_ch.tmpl b/nano/templates/Casino_prize_dispenser_ch.tmpl index 01317fc24d..0e3ce09fdd 100644 --- a/nano/templates/Casino_prize_dispenser_ch.tmpl +++ b/nano/templates/Casino_prize_dispenser_ch.tmpl @@ -60,6 +60,17 @@ +
    +
    +
    + {{if data.category_pets >= 1}} + {{:helper.link('Select Pets', 'star', { "Select" : 'selected_pets' })}} + {{else}} + {{:helper.link('Disabled Pets', 'cancel', { "Select" : 1}, 'disabled')}} + {{/if}} +
    +
    +
    {{/if}} {{if data.mode == 1}} diff --git a/vorestation.dme b/vorestation.dme index 3c4520cad4..5be7beaa16 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1316,6 +1316,7 @@ #include "code\game\objects\items\weapons\grenades\projectile.dm" #include "code\game\objects\items\weapons\grenades\smokebomb.dm" #include "code\game\objects\items\weapons\grenades\spawnergrenade.dm" +#include "code\game\objects\items\weapons\grenades\spawnergrenade_ch.dm" #include "code\game\objects\items\weapons\grenades\spawnergrenade_vr.dm" #include "code\game\objects\items\weapons\grenades\supermatter.dm" #include "code\game\objects\items\weapons\id cards\cards.dm"