Skip to content

Commit

Permalink
[MIRROR] [MODULAR] Good Assistant Points: Help the station, get credi…
Browse files Browse the repository at this point in the history
…ts and chicken nuggets! (#295)

* [MODULAR] Good Assistant Points: Help the station, get credits and chicken nuggets! (#24576)

* MAKES SHIT MOSTLY MODULAR

* lol whoops

* assistant payment adjustments

* assistants are paid in full for doing jack shit fuck all again, reduces starting punches to 1

* sprites

* ups it to 100 credits a punch

* Update modular_skyrat/modules/automapper/code/area_spawn_entries.dm

* changes

* whoops

* h

* Update gbp_punchcard.dm

* Update gbp_punchcard.dm

* no erp

* GAP for FF maps?

* fuck it

---------

Co-authored-by: Iamgoofball <[email protected]>
Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: Yaroslav Nurkov <[email protected]>
Co-authored-by: Iajret <[email protected]>
  • Loading branch information
5 people authored Oct 27, 2023
1 parent 905457d commit e122a37
Show file tree
Hide file tree
Showing 9 changed files with 248 additions and 38 deletions.
84 changes: 64 additions & 20 deletions _maps/map_files/KiloStation2/KiloStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1071,6 +1071,7 @@
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
"aov" = (
Expand Down Expand Up @@ -5308,6 +5309,7 @@
/obj/structure/flora/bush/leavy/style_random,
/obj/structure/flora/bush/ferny/style_random,
/obj/structure/flora/bush/flowers_yw/style_random,
/mob/living/basic/pet/bumbles,
/turf/open/floor/grass,
/area/station/service/hydroponics)
"bQn" = (
Expand Down Expand Up @@ -9932,6 +9934,19 @@
/obj/item/wallframe/apc,
/turf/open/floor/iron/dark,
/area/station/maintenance/port/fore)
"dnD" = (
/obj/effect/turf_decal/siding/yellow{
dir = 8
},
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 8
},
/obj/effect/turf_decal/tile/red{
dir = 1
},
/mob/living/simple_animal/pet/poppy,
/turf/open/floor/iron,
/area/station/engineering/lobby)
"dnF" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron/showroomfloor,
Expand Down Expand Up @@ -11603,6 +11618,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/firedoor,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
"dOW" = (
Expand Down Expand Up @@ -21068,6 +21084,12 @@
},
/turf/open/floor/iron/showroomfloor,
/area/station/medical/medbay/central)
"gPo" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/red/half/contrasted,
/obj/effect/landmark/start/corrections_officer,
/turf/open/floor/iron,
/area/station/security/office)
"gPy" = (
/obj/effect/turf_decal/bot,
/obj/machinery/computer/rdconsole{
Expand Down Expand Up @@ -21399,9 +21421,9 @@
"gUK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/directional/east,
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/gbp_redemption,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"gUS" = (
Expand Down Expand Up @@ -23931,6 +23953,7 @@
/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
dir = 8
},
/obj/effect/landmark/start/bouncer,
/turf/open/floor/iron/dark,
/area/station/service/bar/atrium)
"hJZ" = (
Expand Down Expand Up @@ -30106,13 +30129,13 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/landmark/start/depsec/supply,
/obj/structure/chair/office{
dir = 8
},
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/effect/landmark/start/customs_agent,
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/supply)
"jEC" = (
Expand Down Expand Up @@ -32562,7 +32585,7 @@
/obj/structure/window/reinforced/spawner/directional/south,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark/textured,
/area/station/cargo/sorting)
/area/station/hallway/primary/starboard)
"kvM" = (
/obj/machinery/meter,
/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
Expand Down Expand Up @@ -34019,7 +34042,7 @@
/obj/structure/window/reinforced/spawner/directional/north,
/obj/effect/turf_decal/tile/neutral/opposingcorners,
/turf/open/floor/iron/dark/textured,
/area/station/cargo/sorting)
/area/station/hallway/primary/starboard)
"kUR" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -35000,6 +35023,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/engineering_guard,
/turf/open/floor/iron,
/area/station/security/checkpoint/engineering)
"ljy" = (
Expand Down Expand Up @@ -37175,6 +37199,7 @@
dir = 4
},
/obj/machinery/light/directional/north,
/obj/effect/landmark/start/blueshield,
/turf/open/floor/carpet/royalblack,
/area/station/command/heads_quarters/captain)
"lUq" = (
Expand Down Expand Up @@ -39502,8 +39527,8 @@
/obj/item/storage/belt/utility,
/obj/item/clothing/head/utility/welding,
/obj/item/clothing/glasses/welding,
/obj/structure/noticeboard/directional/north,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/posialert/directional/north,
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"mGz" = (
Expand Down Expand Up @@ -41195,6 +41220,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
/obj/machinery/vending/access/command,
/turf/open/floor/iron,
/area/station/command/bridge)
"njf" = (
Expand Down Expand Up @@ -44820,14 +44846,14 @@
/area/space/nearstation)
"ozt" = (
/obj/structure/chair/office/light,
/obj/effect/landmark/start/depsec/medical,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/effect/turf_decal/tile/red/opposingcorners{
dir = 1
},
/obj/effect/turf_decal/tile/red/anticorner/contrasted,
/obj/effect/landmark/start/orderly,
/turf/open/floor/iron/showroomfloor,
/area/station/security/checkpoint/medical)
"ozw" = (
Expand Down Expand Up @@ -47465,6 +47491,7 @@
dir = 1
},
/obj/effect/spawner/random/engineering/tracking_beacon,
/mob/living/basic/pet/dog/corgi/borgi,
/turf/open/floor/iron,
/area/station/science/robotics/mechbay)
"pqu" = (
Expand Down Expand Up @@ -49759,6 +49786,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/mob/living/basic/pet/dog/markus,
/turf/open/floor/iron,
/area/station/cargo/storage)
"qdk" = (
Expand Down Expand Up @@ -58826,9 +58854,6 @@
pixel_x = 6;
pixel_y = 5
},
/obj/machinery/ecto_sniffer{
pixel_x = -6
},
/obj/item/mod/core/standard{
pixel_x = -4
},
Expand Down Expand Up @@ -60659,6 +60684,7 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 1
},
/obj/effect/landmark/start/corrections_officer,
/turf/open/floor/iron/showroomfloor,
/area/station/security/execution/transfer)
"tzF" = (
Expand Down Expand Up @@ -60694,11 +60720,10 @@
/area/station/hallway/primary/central)
"tzL" = (
/obj/effect/turf_decal/bot,
/obj/structure/table,
/obj/item/flashlight/lamp,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 1
},
/obj/machinery/ammo_workbench,
/turf/open/floor/iron/dark,
/area/station/security/office)
"tzN" = (
Expand Down Expand Up @@ -61412,6 +61437,7 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/obj/structure/closet/secure_closet/blueshield,
/turf/open/floor/iron,
/area/station/command/bridge)
"tMW" = (
Expand Down Expand Up @@ -62759,6 +62785,12 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/maintenance/port/lesser)
"uhb" = (
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/effect/landmark/start/blueshield,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"uhp" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
dir = 4
Expand Down Expand Up @@ -68343,6 +68375,7 @@
dir = 8
},
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/obj/effect/landmark/start/bouncer,
/turf/open/floor/wood,
/area/station/service/bar/atrium)
"vSp" = (
Expand Down Expand Up @@ -69492,6 +69525,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/cryopod/prison/directional/west,
/turf/open/floor/plating,
/area/station/security/prison)
"wkP" = (
Expand Down Expand Up @@ -70523,6 +70557,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/red,
/obj/effect/landmark/start/science_guard,
/turf/open/floor/iron/showroomfloor,
/area/station/security/checkpoint/science/research)
"wAG" = (
Expand Down Expand Up @@ -70690,6 +70725,7 @@
/obj/structure/chair/stool/bar/directional/east,
/obj/machinery/computer/security/telescreen/entertainment/directional/north,
/obj/effect/turf_decal/tile/red/opposingcorners,
/obj/effect/landmark/start/bouncer,
/turf/open/floor/iron/showroomfloor,
/area/station/service/bar/atrium)
"wEJ" = (
Expand Down Expand Up @@ -71392,6 +71428,12 @@
},
/turf/open/floor/iron,
/area/station/command/bridge)
"wOX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/obj/structure/curtain/cloth/prison,
/turf/open/floor/plating,
/area/station/security/prison/safe)
"wPh" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -73538,6 +73580,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/machinery/computer/cryopod/directional/west,
/turf/open/floor/plating,
/area/station/security/prison)
"xAW" = (
Expand Down Expand Up @@ -74940,6 +74983,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/sign/poster/official/random/directional/west,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
"xWS" = (
Expand Down Expand Up @@ -80939,8 +80983,8 @@ aeU
aeU
aeu
nKO
eJN
eJN
wOX
wOX
toh
nIW
koi
Expand Down Expand Up @@ -83252,11 +83296,11 @@ aaa
aaa
vku
nKO
eJN
eJN
wOX
wOX
nKO
eJN
eJN
wOX
wOX
nKO
qJs
sAv
Expand Down Expand Up @@ -94578,7 +94622,7 @@ lTf
oKW
tUV
uZC
pNe
gPo
esn
pZI
pUA
Expand Down Expand Up @@ -105087,7 +105131,7 @@ wiM
pFs
tnq
fvT
spQ
uhb
sQj
cBW
ftz
Expand Down Expand Up @@ -110514,7 +110558,7 @@ rwD
pwo
hZT
lNK
lNK
dnD
rvU
pLu
lbq
Expand Down
Loading

0 comments on commit e122a37

Please sign in to comment.