From 575a719688693724a0b199b9a2f2e969e36e1c9f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 31 Jul 2022 13:09:00 -0500 Subject: [PATCH 1/2] get_random_colour() now prepends a # --- code/_helpers/unsorted.dm | 6 +- .../effects/decals/Cleanable/humans.dm | 6 +- code/game/objects/items/weapons/melee/misc.dm | 4 +- .../objects/items/weapons/storage/wallets.dm | 63 ++++++++++++++++++- code/game/objects/items/weapons/towels.dm | 2 +- code/modules/hydroponics/seed.dm | 8 +-- code/modules/hydroponics/trays/tray.dm | 2 +- 7 files changed, 76 insertions(+), 15 deletions(-) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 717d7a927b..4c60b7a9bc 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1154,7 +1154,7 @@ var/list/WALLITEMS = list( if(length(temp_col )<2) temp_col = "0[temp_col]" colour += temp_col - return colour + return "#[colour]" /proc/color_square(red, green, blue, hex) var/color = hex ? hex : "#[num2hex(red, 2)][num2hex(green, 2)][num2hex(blue, 2)]" @@ -1171,7 +1171,7 @@ var/mob/dview/dview_mob = new log_error("Had to recreate the dview mob!") dview_mob.loc = center - + dview_mob.see_invisible = invis_flags . = view(range, dview_mob) @@ -1490,7 +1490,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage) . += new /obj/screen/plane_master/lighting //Lighting system (but different!) . += new /obj/screen/plane_master/o_light_visual //Object lighting (using masks) . += new /obj/screen/plane_master/emissive //Emissive overlays - + . += new /obj/screen/plane_master/ghosts //Ghosts! . += new /obj/screen/plane_master{plane = PLANE_AI_EYE} //AI Eye! diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index b32777c65a..6f96ec1689 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -52,7 +52,7 @@ var/global/list/image/splatter_cache=list() addtimer(CALLBACK(src, .proc/dry), DRYING_TIME * (amount+1)) /obj/effect/decal/cleanable/blood/update_icon() - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") basecolor = get_random_colour(1) color = basecolor if(basecolor == SYNTH_BLOOD_COLOUR) @@ -184,11 +184,11 @@ var/global/list/image/splatter_cache=list() var/image/giblets = new(base_icon, "[icon_state]_flesh", dir) if(!fleshcolor || fleshcolor == "rainbow") - fleshcolor = "#[get_random_colour(1)]" + fleshcolor = get_random_colour(1) giblets.color = fleshcolor var/icon/blood = new(base_icon,"[icon_state]",dir) - if(basecolor == "rainbow") basecolor = "#[get_random_colour(1)]" + if(basecolor == "rainbow") basecolor = get_random_colour(1) blood.Blend(basecolor,ICON_MULTIPLY) icon = blood diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 6fddd15013..5930c1ad7e 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -57,7 +57,7 @@ // Randomizes color /obj/item/weapon/melee/umbrella/random/New() - color = "#"+get_random_colour() + color = get_random_colour() ..() /obj/item/weapon/melee/cursedblade @@ -95,4 +95,4 @@ new_voice.name = "cursed sword" //Cursed swords shouldn't be known characters. new_voice.real_name = "cursed sword" voice_mobs.Add(new_voice) - listening_objects |= src \ No newline at end of file + listening_objects |= src diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 4161ae740b..72e09851d6 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -107,7 +107,7 @@ /obj/item/weapon/storage/wallet/poly/New() ..() verbs |= /obj/item/weapon/storage/wallet/poly/proc/change_color - color = "#"+get_random_colour() + color = get_random_colour() update_icon() /obj/item/weapon/storage/wallet/poly/proc/change_color() @@ -139,3 +139,64 @@ desc = "A stylish wallet typically used by women." icon_state = "girl_wallet" item_state_slots = list(slot_r_hand_str = "wowallet", slot_l_hand_str = "wowallet") +<<<<<<< HEAD +======= + +//Casino Wallet + +/obj/item/weapon/storage/wallet/casino + name = "casino wallet" + desc = "A fancy casino wallet with flashy lights, oooh~" + icon = 'icons/obj/casino.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/storage/wallet/casino/verb/toggle_design() + set category = "Object" + set name = "Toggle design" + set src in usr + + if (icon_state == "casinowallet_black") + icon_state = "casinowallet_brown" + return + if (icon_state == "casinowallet_brown") + icon_state = "casinowallet_white" + return + else + icon_state = "casinowallet_black" +>>>>>>> 2f41233382... get_random_colour() now prepends a # (#13423) diff --git a/code/game/objects/items/weapons/towels.dm b/code/game/objects/items/weapons/towels.dm index 119c9d7419..df027debd4 100644 --- a/code/game/objects/items/weapons/towels.dm +++ b/code/game/objects/items/weapons/towels.dm @@ -31,4 +31,4 @@ /obj/item/weapon/towel/random/New() ..() - color = "#"+get_random_colour() \ No newline at end of file + color = get_random_colour() diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 1856b4ce84..b54b661ce5 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -419,8 +419,8 @@ set_trait(TRAIT_POTENCY,rand(5,30),200,0) set_trait(TRAIT_PRODUCT_ICON,pick(SSplants.accessible_product_sprites)) set_trait(TRAIT_PLANT_ICON,pick(SSplants.accessible_plant_sprites)) - set_trait(TRAIT_PLANT_COLOUR,"#[get_random_colour(0,75,190)]") - set_trait(TRAIT_PRODUCT_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_PLANT_COLOUR,get_random_colour(0,75,190)) + set_trait(TRAIT_PRODUCT_COLOUR,get_random_colour(0,75,190)) update_growth_stages() if(prob(20)) @@ -548,7 +548,7 @@ if(prob(5)) set_trait(TRAIT_BIOLUM,1) - set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) if(prob(3)) set_trait(TRAIT_SPORING,1) @@ -654,7 +654,7 @@ if(get_trait(TRAIT_BIOLUM)) source_turf.visible_message("\The [display_name] begins to glow!") if(prob(degree*2)) - set_trait(TRAIT_BIOLUM_COLOUR,"#[get_random_colour(0,75,190)]") + set_trait(TRAIT_BIOLUM_COLOUR,get_random_colour(0,75,190)) source_turf.visible_message("\The [display_name]'s glow changes colour!") else source_turf.visible_message("\The [display_name]'s glow dims...") diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index eae1f78b93..bb33a4e229 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -426,7 +426,7 @@ // harvested yet and it's safe to assume it's restricted to this tray. if(!isnull(SSplants.seeds[seed.name])) seed = seed.diverge() - seed.mutate(severity,get_turf(src)) + seed.mutate(severity,get_turf(src)) return From ac1f228231959d01b8fafdd362d2a08e6c038dc0 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Mon, 1 Aug 2022 22:11:09 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../objects/items/weapons/storage/wallets.dm | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index 72e09851d6..13e744e141 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -139,64 +139,3 @@ desc = "A stylish wallet typically used by women." icon_state = "girl_wallet" item_state_slots = list(slot_r_hand_str = "wowallet", slot_l_hand_str = "wowallet") -<<<<<<< HEAD -======= - -//Casino Wallet - -/obj/item/weapon/storage/wallet/casino - name = "casino wallet" - desc = "A fancy casino wallet with flashy lights, oooh~" - icon = 'icons/obj/casino.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/storage/wallet/casino/verb/toggle_design() - set category = "Object" - set name = "Toggle design" - set src in usr - - if (icon_state == "casinowallet_black") - icon_state = "casinowallet_brown" - return - if (icon_state == "casinowallet_brown") - icon_state = "casinowallet_white" - return - else - icon_state = "casinowallet_black" ->>>>>>> 2f41233382... get_random_colour() now prepends a # (#13423)