More Silly Crates (#29310)

* bleh

* blah

* bluh

* Update folders.dm

* Update pack_miscellaneous.dm

* baba

* bebe

* bobo

* Increased energy use per shot for fake egun

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/energy.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Osetrokarasek
2025-06-04 13:00:35 +00:00
committed by GitHub
co-authored by Luc
parent 4c2928a2bb
commit 0e06151754
9 changed files with 302 additions and 2 deletions
+8
View File
@@ -293,6 +293,14 @@
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
// Replica
/obj/item/clothing/head/helmet/fake
name = "replica helmet"
desc = "A replica of a mass-produced protective helmet used by security personnel across the sector. Made of cheap plastic and provides no protection."
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
cold_protection = FALSE
heat_protection = FALSE
//Commander
/obj/item/clothing/head/helmet/ert/command
name = "emergency response team commander helmet"
+13
View File
@@ -1479,3 +1479,16 @@
name = "rainbow abaya"
icon_state = "rainbowabaya"
hoodtype = /obj/item/clothing/head/hooded/screened_niqab/rainbow
/obj/item/clothing/suit/fake_armor
name = "repliсa armor vest"
desc = "A replica of armor vest made of cheap foam rubber, plastic sheets and duct tape. Obviously, provides no protection."
icon_state = "armor"
item_state = "armor"
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi'
)
+4
View File
@@ -114,6 +114,10 @@
new /obj/item/documents/syndicate/red(src)
update_icon(UPDATE_OVERLAYS)
/obj/item/folder/syndicate/fake_red
desc = "A folder stamped \"Top Secret - Property of The Syndicate\". Its glossy cover seems cheap."
icon_state = "folder_sred"
/obj/item/folder/syndicate/blue
icon_state = "folder_sblue"
@@ -192,6 +192,10 @@
randomspread = 1
delay = 0
/obj/item/ammo_casing/energy/disabler/fake
projectile_type = /obj/item/projectile/beam/disabler/fake
e_cost = 100
/obj/item/ammo_casing/energy/disabler/eshotgun
projectile_type = /obj/item/projectile/beam/disabler/pellet
muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE
@@ -264,3 +264,13 @@
. += ""
. += "This scatter-beam technology allows for more energy output per trigger pull, however the increased heat on the focusing lens has resulted in a decreased fire rate compared to the standard fare. \
It is a Nanotrasen officer's best friend, allowing them to stop crime one trigger pull at a time."
// MARK: FAKE ENERGY GUN
/obj/item/gun/energy/gun/fake
name = "replica EG-7 energy gun"
desc = "It's a laser tag gun redesigned with a few pieces of cheap plastic to look like an EG-7 energy gun, so you won't harm anyone. This one isn't even sanctioned for laser tag, sad."
ammo_type = list(/obj/item/ammo_casing/energy/disabler/fake)
can_flashlight = FALSE
selfcharge = TRUE
can_charge = FALSE
throwforce = 0
@@ -111,6 +111,11 @@
armour_penetration_flat = -10
light_color = LIGHT_COLOR_BLUE
/obj/item/projectile/beam/disabler/fake
name = "weakened disabler beam"
nodamage = 1
damage = 0
/obj/item/projectile/beam/disabler/pellet
name = "split disabler beam"
icon_state = "scatterdisabler"
@@ -138,7 +138,8 @@
/obj/item/poster/random_official,
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper,
/obj/item/stack/wrapping_paper)
/obj/item/stack/wrapping_paper,
/obj/item/storage/toolbox/artistic)
cost = 100
containername = "arts and crafts crate"
@@ -625,7 +626,7 @@
/datum/supply_packs/misc/cookware_crate
name = "Kitchen Cookware Crate"
cost = 250
cost = 100
contains = list(
/obj/item/reagent_containers/cooking/board,
/obj/item/reagent_containers/cooking/bowl,
@@ -643,3 +644,204 @@
)
containertype = /obj/structure/closet/crate/cookware
containername = "cookware crate"
/datum/supply_packs/misc/mugs
name = "Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug,
/obj/item/reagent_containers/drinks/mug,
/obj/item/reagent_containers/drinks/mug
)
cost = 100
containername = "coffee mugs crate"
/datum/supply_packs/misc/mugs_sec
name = "Security Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/sec,
/obj/item/reagent_containers/drinks/mug/sec,
/obj/item/reagent_containers/drinks/mug/sec
)
cost = 100
containername = "security coffee mugs crate"
containertype = /obj/structure/closet/crate/secure
access = ACCESS_SECURITY
/datum/supply_packs/misc/mugs_sci
name = "Science Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/sci,
/obj/item/reagent_containers/drinks/mug/sci,
/obj/item/reagent_containers/drinks/mug/sci
)
cost = 100
containername = "science coffee mugs crate"
containertype = /obj/structure/closet/crate/secure
access = ACCESS_RESEARCH
/datum/supply_packs/misc/mugs_eng
name = "Engineering Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/eng,
/obj/item/reagent_containers/drinks/mug/eng,
/obj/item/reagent_containers/drinks/mug/eng
)
cost = 100
containername = "engineering coffee mugs crate"
containertype = /obj/structure/closet/crate/secure
access = ACCESS_CONSTRUCTION
/datum/supply_packs/misc/mugs_med
name = "Medical Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/med,
/obj/item/reagent_containers/drinks/mug/med,
/obj/item/reagent_containers/drinks/mug/med
)
cost = 100
containername = "medical coffee mugs crate"
containertype = /obj/structure/closet/crate/secure
access = ACCESS_MEDICAL
/datum/supply_packs/misc/mugs_serv
name = "Service Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/serv,
/obj/item/reagent_containers/drinks/mug/serv,
/obj/item/reagent_containers/drinks/mug/serv
)
cost = 100
containername = "service coffee mugs crate"
/datum/supply_packs/misc/mugs_novelty
name = "Novelty Coffee Mugs Crate"
contains = list(
/obj/item/reagent_containers/drinks/mug/novelty,
/obj/item/reagent_containers/drinks/mug/novelty,
/obj/item/reagent_containers/drinks/mug/novelty
)
cost = 250
containername = "novelty coffee mugs crate"
/datum/supply_packs/misc/sec_cosplay
name = "Security Officer Cosplay Kit"
contains = list(
/obj/item/clothing/under/color/red,
/obj/item/clothing/head/helmet/fake,
/obj/item/clothing/suit/fake_armor,
/obj/item/clothing/shoes/jackboots,
/obj/item/storage/fancy/donut_box,
/obj/item/restraints/handcuffs/toy,
/obj/item/toy/flash,
/obj/item/clothing/glasses/sunglasses_fake,
/obj/item/gun/energy/gun/fake
)
cost = 500
containername = "security officer cosplay kit"
/datum/supply_packs/misc/syndi_sci_cosplay
name = "Unethical Sciencist Cosplay Kit"
contains = list(
/obj/item/clothing/suit/storage/labcoat,
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/storage/belt/utility/expedition/vendor,
/obj/item/storage/toolbox/fakesyndi,
/obj/item/folder/syndicate/fake_red
)
cost = 500
containername = "unethical sciencist cosplay kit"
contraband = TRUE
/datum/supply_packs/misc/potted_plants_medium
name = "Potted Plants Crate"
contains = list(
/obj/item/kirbyplants/medium,
/obj/item/kirbyplants/medium,
/obj/item/kirbyplants/medium
)
cost = 100
containername = "potted plants crate"
containertype = /obj/structure/closet/crate/plastic
/datum/supply_packs/misc/potted_plants_small
name = "Tabletop Potted Plants Crate"
contains = list(
/obj/item/kirbyplants/small,
/obj/item/kirbyplants/small,
/obj/item/kirbyplants/small
)
cost = 50
containername = "tabletop potted plants crate"
containertype = /obj/structure/closet/crate/plastic
/datum/supply_packs/misc/potted_plants_alien
name = "Alien Potted Plants Crate"
contains = list(
/obj/item/kirbyplants/large/alien,
/obj/item/kirbyplants/large/alien,
/obj/item/kirbyplants/large/alien
)
cost = 150
containername = "alien potted plants crate"
containertype = /obj/structure/closet/crate/plastic
/datum/supply_packs/misc/flag_sci
name = "RnD Flag Crate"
contains = list(
/obj/item/flag/rnd
)
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "RnD flag crate"
access = ACCESS_RESEARCH
/datum/supply_packs/misc/flag_sec
name = "Security Flag Crate"
contains = list(
/obj/item/flag/sec
)
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "security flag crate"
access = ACCESS_SECURITY
/datum/supply_packs/misc/flag_sup
name = "Supply Flag Crate"
contains = list(
/obj/item/flag/cargo
)
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "supply flag crate"
access = ACCESS_CARGO
/datum/supply_packs/misc/flag_atm
name = "Atmospherics Flag Crate"
contains = list(
/obj/item/flag/atmos
)
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "atmospherics flag crate"
access = ACCESS_CONSTRUCTION
/datum/supply_packs/misc/flag_com
name = "Command Flag Crate"
contains = list(
/obj/item/flag/command
)
cost = 250
containertype = /obj/structure/closet/crate/secure
containername = "command flag crate"
access = ACCESS_HEADS
/datum/supply_packs/misc/flag_greytide
name = "Assistant Flag Crate"
contains = list(
/obj/item/flag/grey
)
cost = 250
containername = "assistant flag crate"
contraband = TRUE
@@ -91,6 +91,47 @@
cost = 300
containername = "condiment crate"
/datum/supply_packs/organic/seafood
name = "Seafood Crate"
contains = list(
/obj/item/fish/salmon,
/obj/item/fish/salmon,
/obj/item/fish/salmon,
/obj/item/fish/catfish,
/obj/item/fish/catfish,
/obj/item/fish/catfish,
/obj/item/food/shrimp,
/obj/item/food/shrimp,
/obj/item/food/shrimp,
/obj/item/food/shrimp
)
cost = 300
containername = "seafood crate"
/datum/supply_packs/organic/donuts
name = "Donuts Crate"
contains = list(
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/donut_box,
/obj/item/storage/fancy/donut_box
)
cost = 450
containername = "donuts crate"
/datum/supply_packs/organic/donkpocket
name = "Donk-Pockets Crate"
contains = list(
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets,
/obj/item/storage/box/donkpockets
)
cost = 400
containername = "donk-pockets crate"
/datum/supply_packs/organic/monkey
name = "Monkey Crate"
contains = list (/obj/item/storage/box/monkeycubes)
@@ -390,3 +390,16 @@
containertype = /obj/structure/largecrate/secway
containername = "secway crate"
access = ACCESS_HEADS
/datum/supply_packs/security/party_ammo
name = "Party Ammunition Crate"
contains = list(
/obj/item/grenade/confetti,
/obj/item/grenade/confetti,
/obj/item/grenade/confetti,
/obj/item/storage/fancy/shell/confetti,
/obj/item/storage/fancy/shell/confetti,
/obj/item/storage/fancy/shell/confetti
)
cost = 300
containername = "party ammunition crate"