cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a Collection of Spent Ballistic Casings With Random Rotation and Offsets (#26958)

Browse Source 
* Update trash.dm

* Creation

* Update ussp.dmm

* Update trash.dm

* Update code/game/objects/items/trash.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update trash_spawners.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-10-22 09:24:40 +00:00
committed by GitHub
co-authored by Luc
parent 2049cf06c3
commit 6106bafc21
3 changed files with 93 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+22 -50
View File
@@ -1840,9 +1840,7 @@
name = "custom placement";
pixel_x = 30
},
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"eJ" = (
@@ -2001,9 +1999,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/derelict/hallway/primary)
"fb" = (
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fc" = (
@@ -2238,14 +2234,12 @@
},
/area/ruin/space/derelict/arrival)
"fB" = (
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fC" = (
@@ -2257,12 +2251,12 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fD" = (
/obj/item/trash/spentcasing,
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fE" = (
@@ -2390,14 +2384,12 @@
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fU" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fV" = (
/obj/structure/chair/stool/bar,
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"fW" = (
@@ -2563,7 +2555,7 @@
},
/area/ruin/space/derelict/arrival)
"gr" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gs" = (
@@ -2689,7 +2681,7 @@
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"gH" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/grimy,
/area/ruin/space/derelict/crew_quarters)
"gI" = (
@@ -2715,9 +2707,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gM" = (
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"gN" = (
@@ -3212,7 +3202,7 @@
d2 = 2;
icon_state = "1-2"
},
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"ia" = (
@@ -3310,9 +3300,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"in" = (
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
@@ -3357,9 +3345,7 @@
/area/ruin/space/derelict/arrival)
"ix" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"iy" = (
@@ -3460,7 +3446,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"iL" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"iM" = (
@@ -3669,9 +3655,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"jo" = (
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"jp" = (
@@ -3685,9 +3669,7 @@
/area/ruin/space/derelict/arrival)
"jq" = (
/obj/effect/landmark/burnturf,
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"jr" = (
@@ -3705,7 +3687,7 @@
},
/area/ruin/space/derelict/hallway/primary)
"jt" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "rampbottom"
@@ -3914,9 +3896,7 @@
},
/area/ruin/space/derelict/arrival)
"jX" = (
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel{
icon_state = "derelict14"
},
@@ -3992,9 +3972,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/hallway/primary)
"kf" = (
@@ -4369,7 +4347,7 @@
},
/area/ruin/space/derelict/arrival)
"kN" = (
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/turf/simulated/floor/plasteel{
icon_state = "derelict3"
},
@@ -4413,9 +4391,7 @@
/area/ruin/space/derelict/arrival)
"kU" = (
/obj/machinery/light/small,
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "redblue"
@@ -4540,9 +4516,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"ll" = (
/obj/item/trash/spentcasing{
icon_state = "s-casing"
},
/obj/item/trash/spentcasing/bullet,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"lm" = (
@@ -4890,9 +4864,7 @@
},
/area/ruin/space/derelict/arrival)
"mf" = (
/obj/item/trash/spentcasing{
icon_state = "762-casing"
},
/obj/item/trash/spentcasing/bullet/medium,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"mg" = (
code/game/objects/effects/spawners/random/trash_spawners.dm
+10 -2
View File
@@ -58,8 +58,16 @@
// Ammo casings rarely
list(
/obj/item/ammo_casing/c10mm,
/obj/item/trash/spentcasing,
/obj/item/trash/spentcasing/shotgun,
/obj/item/trash/spentcasing/shotgun/rubbershot,
/obj/item/trash/spentcasing/shotgun/beanbag,
/obj/item/trash/spentcasing/shotgun/slug,
/obj/item/trash/spentcasing/shotgun/dragonsbreath,
/obj/item/trash/spentcasing/shotgun/stun,
/obj/item/trash/spentcasing/bullet,
/obj/item/trash/spentcasing/bullet/medium,
/obj/item/trash/spentcasing/bullet/large,
/obj/item/trash/spentcasing/bullet/lasershot
) = 1,
)
code/game/objects/items/trash.dm
+61 -8
View File
@@ -17,6 +17,9 @@
return TRUE
return ..()
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return
/obj/item/trash/raisins
name = "4no raisins"
icon_state= "4no_raisins"
@@ -117,12 +120,6 @@
name = "bread tube"
icon_state = "tastybread"
/obj/item/trash/spentcasing
icon = 'icons/obj/ammo.dmi'
name = "bullet casing"
desc = "A spent bullet casing. Smells like cordite."
icon_state = "gshell"
/obj/item/trash/tapetrash
name = "old duct tape"
icon_state = "tape"
@@ -134,5 +131,61 @@
icon_state = "popsicle_stick_s"
desc = "Still tastes sweet."
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return
// Ammo casings
/obj/item/trash/spentcasing
icon = 'icons/obj/ammo.dmi'
name = "arbitrary spent casing item"
desc = "If you can see this and didn't spawn it, make an issue report on GitHub."
icon_state = "gshell"
/obj/item/trash/spentcasing/Initialize(mapload)
. = ..()
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
transform = turn(transform, rand(0, 360))
/obj/item/trash/spentcasing/shotgun
name = "spent buckshot shell"
desc = "A spent shotgun shell. It smells like cordite."
icon_state = "gshell"
/obj/item/trash/spentcasing/shotgun/rubbershot
name = "spent rubbershot shell"
desc = "A spent shotgun shell. It smells like cordite and singed rubber."
icon_state = "cshell"
/obj/item/trash/spentcasing/shotgun/beanbag
name = "spent beanbag shell"
icon_state = "bshell"
/obj/item/trash/spentcasing/shotgun/slug
name = "spent slug shell"
icon_state = "blshell"
/obj/item/trash/spentcasing/shotgun/dragonsbreath
name = "spent dragonsbreath shell"
desc = "A spent shotgun shell. It smells like cordite, burnt plastic, and a hint of petroleum."
icon_state = "ishell"
/obj/item/trash/spentcasing/shotgun/stun
name = "spent stun shell"
icon_state = "stunshell"
/obj/item/trash/spentcasing/bullet
name = "spent bullet casing"
desc = "A spent bullet casing. It smells of brass and cordite."
icon_state = "s-casing"
/obj/item/trash/spentcasing/bullet/medium
name = "spent large bullet casing"
desc = "A spent high-caliber bullet casing. It smells of brass and cordite."
icon_state = "762-casing"
/obj/item/trash/spentcasing/bullet/large
name = "spent .50 BMG bullet casing"
desc = "A spent .50 BMG bullet casing. It smells of brass and cordite."
icon_state = ".50"
/obj/item/trash/spentcasing/bullet/lasershot
desc = "A spent IK-series single-use lasershot cell. It smells of burnt plastic with a metallic-chemical undertone."
icon_state = "lasercasing"