cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] space cleanup (#10414)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-15 00:47:51 +01:00
committed by GitHub
co-authored by Kashargul
parent 3ef8163aa0
commit 789db280cc
187 changed files with 3545 additions and 3547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_yw.dm
+1 -1
View File
@@ -11,7 +11,7 @@
decals = list(
"upper_side_vent",
"lower_side_vent"
)
)
/decl/closet_appearance/secure_closet/lumber
can_lock = FALSE
code/game/objects/structures/droppod.dm
+7 -7
View File
@@ -124,12 +124,12 @@
// This is about 0.896m^3 of atmosphere, which is enough to last for quite a while.
/datum/gas_mixture/pod_air
volume = 2500
temperature = 293.150
total_moles = 104
volume = 2500
temperature = 293.150
total_moles = 104
/datum/gas_mixture/pod_air/New()
. = ..()
gas = list(
GAS_O2 = 21,
GAS_N2 = 79)
. = ..()
gas = list(
GAS_O2 = 21,
GAS_N2 = 79)
code/game/objects/structures/flora/flora_vr.dm
+7 -7
View File
@@ -11,14 +11,14 @@
icon_state = "spawner-jackolantern"
/obj/effect/landmark/carved_pumpkin_spawn/New()
var/new_pumpkin = pick(
var/new_pumpkin = pick(
prob(70);/obj/structure/flora/pumpkin,
prob(60);/obj/structure/flora/pumpkin/carved,
prob(30);/obj/structure/flora/pumpkin/carved/scream,
prob(30);/obj/structure/flora/pumpkin/carved/girly,
prob(10);/obj/structure/flora/pumpkin/carved/owo)
new new_pumpkin(src.loc)
..()
prob(60);/obj/structure/flora/pumpkin/carved,
prob(30);/obj/structure/flora/pumpkin/carved/scream,
prob(30);/obj/structure/flora/pumpkin/carved/girly,
prob(10);/obj/structure/flora/pumpkin/carved/owo)
new new_pumpkin(src.loc)
..()
/obj/structure/flora/pumpkin/carved
name = "jack o'lantern"
code/game/objects/structures/loot_piles.dm
+43 -43
View File
@@ -549,50 +549,50 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
)
/obj/structure/loot_pile/surface/bones
name = "bone pile"
desc = "A pile of various dusty bones. Your graverobbing instincts tell you there might be valuables here."
icon = 'icons/obj/bones.dmi'
icon_state = "bonepile"
delete_on_depletion = TRUE
name = "bone pile"
desc = "A pile of various dusty bones. Your graverobbing instincts tell you there might be valuables here."
icon = 'icons/obj/bones.dmi'
icon_state = "bonepile"
delete_on_depletion = TRUE
common_loot = list(
/obj/item/bone,
/obj/item/bone/skull,
/obj/item/bone/skull/tajaran,
/obj/item/bone/skull/unathi,
/obj/item/bone/skull/unknown,
/obj/item/bone/leg,
/obj/item/bone/arm,
/obj/item/bone/ribs,
)
uncommon_loot = list(
/obj/item/coin/gold,
/obj/item/coin/silver,
/obj/item/deck/tarot,
/obj/item/flame/lighter/zippo/gold,
/obj/item/flame/lighter/zippo/black,
/obj/item/material/knife/tacknife/survival,
/obj/item/material/knife/tacknife/combatknife,
/obj/item/material/knife/machete/hatchet,
/obj/item/material/knife/butch,
/obj/item/storage/wallet/random,
/obj/item/clothing/accessory/bracelet/material/gold,
/obj/item/clothing/accessory/bracelet/material/silver,
/obj/item/clothing/accessory/locket,
/obj/item/clothing/accessory/poncho/blue,
/obj/item/clothing/shoes/boots/cowboy,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/under/frontier,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/pants/classicjeans/ripped,
/obj/item/clothing/under/sl_suit
)
rare_loot = list(
/obj/item/storage/belt/utility/alien/full,
/obj/item/gun/projectile/revolver,
/obj/item/gun/projectile/sec,
/obj/item/gun/launcher/crossbow
)
common_loot = list(
/obj/item/bone,
/obj/item/bone/skull,
/obj/item/bone/skull/tajaran,
/obj/item/bone/skull/unathi,
/obj/item/bone/skull/unknown,
/obj/item/bone/leg,
/obj/item/bone/arm,
/obj/item/bone/ribs,
)
uncommon_loot = list(
/obj/item/coin/gold,
/obj/item/coin/silver,
/obj/item/deck/tarot,
/obj/item/flame/lighter/zippo/gold,
/obj/item/flame/lighter/zippo/black,
/obj/item/material/knife/tacknife/survival,
/obj/item/material/knife/tacknife/combatknife,
/obj/item/material/knife/machete/hatchet,
/obj/item/material/knife/butch,
/obj/item/storage/wallet/random,
/obj/item/clothing/accessory/bracelet/material/gold,
/obj/item/clothing/accessory/bracelet/material/silver,
/obj/item/clothing/accessory/locket,
/obj/item/clothing/accessory/poncho/blue,
/obj/item/clothing/shoes/boots/cowboy,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/under/frontier,
/obj/item/clothing/under/overalls,
/obj/item/clothing/under/pants/classicjeans/ripped,
/obj/item/clothing/under/sl_suit
)
rare_loot = list(
/obj/item/storage/belt/utility/alien/full,
/obj/item/gun/projectile/revolver,
/obj/item/gun/projectile/sec,
/obj/item/gun/launcher/crossbow
)
// Subtype for mecha and mecha accessories. These might not always be on the surface.
/obj/structure/loot_pile/mecha
code/game/objects/structures/trash_pile_vr.dm
+2 -2
View File
@@ -363,8 +363,8 @@
icon = 'icons/obj/trash_piles.dmi'
icon_state = "randompile"
spawn_types = list(
/mob/living/simple_mob/animal/passive/mouse= 100,
/mob/living/simple_mob/animal/passive/cockroach = 25)
/mob/living/simple_mob/animal/passive/mouse= 100,
/mob/living/simple_mob/animal/passive/cockroach = 25)
simultaneous_spawns = 1
destructible = 1
spawn_delay = 1 HOUR