Skip to content

The Curfew & Sundown Tax Audit #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dawsonkeyes wants to merge 4 commits into
base: master
Choose a base branch
from
Open

The Curfew & Sundown Tax Audit #1092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5341944
tax audit
dawsonkeyes Jun 3, 2026
db6a34f
damn daniel
dawsonkeyes Jun 3, 2026
90fa374
you can has MOD
dawsonkeyes Jun 3, 2026
5a55f6d
get your free TVs
dawsonkeyes Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 67 additions & 83 deletions _maps/doppler/cantina/badguyzone.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
/obj/item/organ/cyberimp/arm/strongarm{
pixel_y = -2
},
/obj/item/organ/cyberimp/chest/spine/atlas,
/obj/item/organ/cyberimp/arm/toolkit/razor_claws{
pixel_y = 4
},
Expand Down Expand Up @@ -437,17 +436,11 @@
/area/ruin/space/has_grav/powered/undisclosed_location)
"gi" = (
/obj/structure/shelf,
/obj/item/crowbar/power/syndicate{
pixel_y = -4
},
/obj/item/crowbar/power/syndicate,
/obj/item/screwdriver/power{
pixel_y = 4
},
/obj/item/screwdriver/power,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/turf_decal/bot,
/obj/item/crowbar/red,
/obj/item/screwdriver/power,
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"gp" = (
Expand Down Expand Up @@ -598,8 +591,15 @@
pixel_x = 1;
pixel_y = -1
},
/obj/item/multitool,
/obj/effect/decal/cleanable/cobweb,
/obj/item/storage/toolbox/mechanical{
has_latches = 0;
latches = "quad_latch";
name = "evil fucked up toolbox";
desc = "Why in the world does it have four latches?";
pixel_y = -8;
pixel_x = 4
},
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"iy" = (
Expand All @@ -609,13 +609,20 @@
/area/ruin/space/has_grav/powered/undisclosed_location)
"iD" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
has_latches = 0;
latches = "quad_latch";
name = "evil fucked up toolbox";
desc = "Why in the world does it have four latches?";
/obj/item/wrench/combat{
pixel_y = 17;
pixel_x = -2
pixel_x = -8
},
/obj/item/wrench/combat{
pixel_y = 10;
pixel_x = -11
},
/obj/item/multitool{
pixel_y = 8;
pixel_x = 8
},
/obj/item/multitool{
pixel_y = 9
},
/obj/item/storage/belt/utility,
/obj/item/storage/belt/utility{
Expand Down Expand Up @@ -869,6 +876,7 @@
/obj/effect/turf_decal/bot,
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_silo,
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"np" = (
Expand Down Expand Up @@ -1655,7 +1663,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/medkit/surgery_syndie{
pixel_y = 6
pixel_y = 7
},
/obj/item/lazarus_injector,
/obj/item/defibrillator/compact/combat/loaded,
Expand Down Expand Up @@ -2485,13 +2493,10 @@
pixel_x = -4;
pixel_y = -5
},
/obj/item/organ/cyberimp/arm/toolkit/gun/laser,
/obj/item/organ/cyberimp/arm/toolkit/gun/laser{
pixel_y = -6
},
/obj/item/organ/cyberimp/arm/toolkit/toolset,
/obj/structure/shelf,
/obj/effect/turf_decal/bot,
/obj/item/organ/cyberimp/chest/spine,
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"JX" = (
Expand Down Expand Up @@ -2540,6 +2545,12 @@
pixel_x = -3;
pixel_y = -10
},
/obj/item/storage/belt/holster{
pixel_x = 2
},
/obj/item/storage/belt/holster{
pixel_y = -6
},
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"KO" = (
Expand All @@ -2563,7 +2574,6 @@
pixel_y = -6
},
/obj/structure/closet/crate/secure/syndicate/mi13,
/obj/item/minigunpack,
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
Expand All @@ -2577,15 +2587,14 @@
pixel_x = 8;
pixel_y = 13
},
/obj/item/storage/medkit/tactical/premium{
pixel_x = 1;
pixel_y = -6
/obj/effect/turf_decal/bot,
/obj/item/storage/medkit/tactical{
pixel_y = -7
},
/obj/item/gun/medbeam{
pixel_y = 1;
pixel_x = -1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"LS" = (
Expand Down Expand Up @@ -2767,10 +2776,9 @@
/area/ruin/space/has_grav/powered/undisclosed_location)
"OB" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/storage/box/syndie_kit/cowboy{
/obj/item/storage/box/syndie_kit/cutouts{
pixel_x = -4
},
/obj/item/storage/box/syndie_kit/cutouts,
/obj/item/storage/box/syndie_kit/combat_baking{
pixel_x = 4
},
Expand All @@ -2779,11 +2787,8 @@
pixel_x = -4
},
/obj/item/storage/box/syndie_kit/throwing_weapons{
pixel_y = 12
},
/obj/item/storage/box/syndie_kit/rebarxbowsyndie{
pixel_x = 4;
pixel_y = 12
pixel_y = 12;
pixel_x = 4
},
/obj/structure/shelf,
/obj/machinery/light/red/directional/south,
Expand Down Expand Up @@ -2859,12 +2864,7 @@
/obj/item/inducer/syndicate{
pixel_y = 9
},
/obj/item/chameleon{
pixel_y = -7;
pixel_x = 4
},
/obj/item/jammer{
pixel_x = -5;
pixel_y = -3
},
/turf/open/floor/iron/colony/nanocarbon,
Expand Down Expand Up @@ -2980,13 +2980,6 @@
/area/ruin/space/has_grav/powered/undisclosed_location)
"Qs" = (
/obj/effect/turf_decal/bot,
/obj/item/stack/sheet/iron/fifty{
pixel_y = 10
},
/obj/item/stack/sheet/glass/fifty{
pixel_y = 6;
pixel_x = 3
},
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"Qz" = (
Expand Down Expand Up @@ -3074,18 +3067,14 @@
/obj/structure/shelf,
/obj/item/storage/box/syndie_kit/chameleon{
pixel_y = -3;
pixel_x = 7
pixel_x = 4
},
/obj/item/storage/backpack/duffelbag/syndie/c4{
pixel_y = 10;
pixel_x = -5
/obj/item/storage/box/syndie_kit/chameleon{
pixel_x = -4;
pixel_y = -3
},
/obj/item/storage/backpack/duffelbag/syndie/surgery{
pixel_y = 6
},
/obj/item/storage/box/syndie_kit/chameleon{
pixel_y = -11;
pixel_x = 3
pixel_y = 7
},
/turf/open/floor/iron/colony/nanocarbon,
/area/ruin/space/has_grav/powered/undisclosed_location)
Expand Down Expand Up @@ -3171,24 +3160,20 @@
/turf/open/floor/plating/nanocarbon,
/area/ruin/space/has_grav/powered/undisclosed_location)
"SE" = (
/obj/structure/shelf,
/obj/item/storage/belt/holster{
pixel_x = 2
},
/obj/item/storage/belt/holster{
pixel_y = -6
},
/obj/item/wrench/combat{
pixel_y = 10;
pixel_x = -7
},
/obj/item/multitool/ai_detect{
pixel_x = 7
},
/obj/item/suppressor{
pixel_y = -6
},
/obj/item/wrench/combat,
/obj/structure/closet/crate/cargo,
/obj/item/stack/sheet/iron/fifty,
/obj/item/stack/sheet/glass/fifty,
/obj/item/stack/sheet/cloth/ten,
/obj/item/stack/sheet/leather/five,
/obj/item/stack/sheet/mineral/gold/fifty,
/obj/item/stack/sheet/mineral/plasma/fifty,
/obj/item/stack/sheet/mineral/titanium/fifty,
/obj/item/stack/sheet/mineral/uranium/fifty,
/obj/item/stack/sheet/mineral/wood/fifty,
/obj/item/stack/sheet/mineral/silver/fifty,
/obj/item/stack/sheet/mineral/diamond/fifty,
/obj/item/stack/sheet/mineral/bananium/five,
/obj/item/stack/sheet/bluespace_crystal/fifty,
/turf/open/floor/iron/colony/nanocarbon,
/area/ruin/space/has_grav/powered/undisclosed_location)
"SF" = (
Expand Down Expand Up @@ -3254,38 +3239,37 @@
"Tz" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/clothing/suit/armor/vest/alt{
pixel_y = -14;
pixel_y = -9;
pixel_x = 8
},
/obj/item/clothing/head/helmet{
pixel_y = -5;
pixel_y = 1;
pixel_x = 7
},
/obj/structure/shelf,
/obj/item/suppressor{
pixel_y = 10
},
/obj/item/jammer{
pixel_x = -5;
pixel_y = 1
pixel_y = 13
},
/obj/item/clothing/head/helmet{
pixel_y = -5;
pixel_y = 1;
pixel_x = -1
},
/obj/item/clothing/head/helmet{
pixel_y = -5;
pixel_y = 1;
pixel_x = -9
},
/obj/item/clothing/suit/armor/vest/alt{
pixel_y = -14
pixel_y = -9
},
/obj/item/clothing/suit/armor/vest/alt{
pixel_y = -14;
pixel_y = -9;
pixel_x = -8
},
/obj/effect/turf_decal/bot,
/obj/machinery/light/red/directional/north,
/obj/item/suppressor{
pixel_y = 11
},
/turf/open/floor/iron/colony/texture,
/area/ruin/space/has_grav/powered/undisclosed_location)
"TB" = (
Expand Down
16 changes: 9 additions & 7 deletions _maps/shuttles/~doppler_shuttles/tiziran_interceptor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,24 @@
/turf/closed/wall/mineral/nanocarbon/nodiagonal/tiziran_bronze,
/area/shuttle/personally_bought/tiziran_interceptor)
"g" = (
/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full,
/obj/item/ammo_box/magazine/ammo_stack/bolt_slug/full,
/obj/item/gun/ballistic/bolt_thrower,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/obj/structure/shelf,
/obj/item/ammo_box/magazine/ammo_stack/bolt_shot/full,
/obj/item/ammo_box/magazine/ammo_stack/bolt_shot/full,
/obj/item/storage/box/tiziran_goods,
/obj/item/storage/box/tiziran_meats{
pixel_y = 3
},
/obj/item/storage/box/tiziran_cans{
pixel_y = -5
},
/turf/open/floor/plating,
/area/shuttle/personally_bought/tiziran_interceptor)
"h" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/machinery/suit_storage_unit/tiziran_raiders,
/obj/machinery/suit_storage_unit/industrial/personal_shuttle/heavy,
/turf/open/floor/plating,
/area/shuttle/personally_bought/tiziran_interceptor)
"i" = (
Expand Down Expand Up @@ -211,8 +213,8 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 8
},
/obj/machinery/suit_storage_unit/tiziran_raiders,
/obj/machinery/light/small/red/directional/east,
/obj/machinery/suit_storage_unit/industrial/personal_shuttle/heavy,
/turf/open/floor/plating,
/area/shuttle/personally_bought/tiziran_interceptor)
"O" = (
Expand Down
Loading
Loading