Skip to content
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

Spleens #4796

Merged
merged 32 commits into from
Jan 17, 2025
Merged

Spleens #4796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ebac90c
Shitcodes in spleens and adds new laser sounds
ThePooba Jan 8, 2025
07da42e
spleens work
ThePooba Jan 8, 2025
257ed9c
Made less shit?
ThePooba Jan 9, 2025
c8f03a2
fixed finally
ThePooba Jan 9, 2025
82a7c93
guh
ThePooba Jan 10, 2025
ebf551f
added spleenless metabolism and nulled spleens to needed races
ThePooba Jan 10, 2025
1440871
shipbreaker fix for welder to alert people outside of area so they st…
ThePooba Jan 13, 2025
1d157be
added sledgehammer
ThePooba Jan 13, 2025
c79a2ea
fixed sledgehammers
ThePooba Jan 13, 2025
9a0fe3d
shitbreaker now immune to radstorms
ThePooba Jan 13, 2025
98f57f6
edited vrpn
ThePooba Jan 13, 2025
71fc4e4
button gon
ThePooba Jan 13, 2025
cc056d3
linter
ThePooba Jan 14, 2025
8e87027
bingus
ThePooba Jan 14, 2025
34d3c97
power use
ThePooba Jan 14, 2025
d3ae482
updated MetaStation
ThePooba Jan 14, 2025
d8a2fbf
updated maps
ThePooba Jan 14, 2025
7392e24
fixxx
ThePooba Jan 14, 2025
a963ce1
guh
ThePooba Jan 14, 2025
03e004e
woops wrong spinner
ThePooba Jan 15, 2025
b2b12dd
compile
ThePooba Jan 16, 2025
ddd434a
musketfix
ThePooba Jan 16, 2025
035799f
splenorrhaphy added
ThePooba Jan 16, 2025
daa05bc
Merge branch 'spleens' of https://github.com/ThePooba/Monkestation2.0…
ThePooba Jan 16, 2025
d6f7b1f
splems
ThePooba Jan 16, 2025
49fcf46
splums
ThePooba Jan 16, 2025
9da05c8
belt
ThePooba Jan 16, 2025
ea133a4
kjgkhj
ThePooba Jan 16, 2025
285796b
gods why
ThePooba Jan 16, 2025
7f127c5
bla
ThePooba Jan 17, 2025
ac2e630
dme fix
ThePooba Jan 17, 2025
4898e9d
jesus christ
ThePooba Jan 17, 2025
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
160 changes: 78 additions & 82 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8174,10 +8174,8 @@
/turf/open/floor/plating,
/area/station/maintenance/rus_gambling)
"bDM" = (
/obj/machinery/door/airlock/engineering,
/obj/structure/cable,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/obj/effect/turf_decal/stripes,
/turf/closed/wall,
/area/station/engineering/shipbreaker_hut)
"bDR" = (
/obj/structure/railing,
Expand Down Expand Up @@ -28218,7 +28216,7 @@
id = "shitbreaker"
},
/obj/structure/window/spawner/directional/north,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"fsG" = (
/obj/effect/spawner/random/decoration/paint,
Expand Down Expand Up @@ -36305,7 +36303,9 @@
/area/station/hallway/primary/port)
"gYY" = (
/obj/structure/cable,
/turf/open/floor/plating/airless,
/obj/structure/fans/tiny,
/obj/machinery/door/airlock/engineering,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"gZk" = (
/obj/effect/turf_decal/stripes/corner{
Expand Down Expand Up @@ -49643,8 +49643,7 @@
/obj/machinery/conveyor{
id = "shitbreaker"
},
/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"jFs" = (
/obj/structure/cable,
Expand Down Expand Up @@ -50868,7 +50867,9 @@
/turf/open/floor/iron/dark,
/area/station/security/checkpoint/engineering)
"jQP" = (
/turf/open/floor/plating/airless,
/obj/machinery/light/directional/west,
/obj/structure/closet/secure_closet/shipbreaker,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"jQR" = (
/obj/effect/turf_decal/stripes{
Expand Down Expand Up @@ -53557,8 +53558,7 @@
dir = 10;
id = "shitbreaker"
},
/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"kpG" = (
/obj/effect/spawner/random/trash/mess,
Expand Down Expand Up @@ -64795,7 +64795,7 @@
id = "shitbreaker"
},
/obj/machinery/shipbreaker,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"mBV" = (
/obj/structure/grille,
Expand Down Expand Up @@ -70004,8 +70004,7 @@
dir = 6;
id = "shitbreaker"
},
/obj/structure/window/spawner/directional/east,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"nEr" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -84511,7 +84510,7 @@
dir = 8;
id = "shitbreaker"
},
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"qtY" = (
/obj/structure/railing,
Expand Down Expand Up @@ -85481,7 +85480,7 @@
dir = 1
},
/obj/machinery/light/directional/west,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"qCS" = (
/obj/structure/flora/grass/jungle,
Expand Down Expand Up @@ -89135,10 +89134,6 @@
/obj/machinery/digital_clock/directional/east,
/turf/open/floor/wood,
/area/station/command/captain_dining)
"rmU" = (
/obj/structure/window/spawner/directional/south,
/turf/open/floor/plating/airless,
/area/station/engineering/shipbreaker_hut)
"rmY" = (
/obj/effect/turf_decal/trimline/purple/filled/warning{
dir = 10
Expand Down Expand Up @@ -91395,7 +91390,9 @@
/area/station/cargo/miningdock)
"rIj" = (
/obj/effect/turf_decal/stripes,
/turf/open/floor/plating/airless,
/obj/machinery/door/airlock/engineering,
/obj/structure/fans/tiny,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"rIB" = (
/obj/structure/lattice/catwalk,
Expand Down Expand Up @@ -105583,10 +105580,9 @@
/turf/open/floor/iron,
/area/station/medical/storage)
"utW" = (
/obj/structure/lattice,
/obj/effect/spawner/random/structure/grille,
/turf/open/space/openspace,
/area/space)
/obj/structure/closet/secure_closet/shipbreaker,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"utX" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 8
Expand Down Expand Up @@ -108303,7 +108299,7 @@
/obj/structure/cable,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/effect/mapping_helpers/apc/full_charge,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"uUQ" = (
/obj/effect/turf_decal/trimline/red/filled/line{
Expand Down Expand Up @@ -111162,7 +111158,7 @@
/area/station/science)
"vxe" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"vxf" = (
/obj/machinery/firealarm/directional/south,
Expand Down Expand Up @@ -122661,7 +122657,7 @@
dir = 4;
id = "shitbreaker"
},
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"xHd" = (
/mob/living/basic/chicken/brown{
Expand Down Expand Up @@ -125090,7 +125086,7 @@
/obj/item/weldingtool/electric/raynewelder{
pixel_y = -5
},
/turf/open/floor/plating/airless,
/turf/open/floor/iron,
/area/station/engineering/shipbreaker_hut)
"yfv" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -213699,7 +213695,7 @@ czg
ulx
czg
ulx
utW
luc
czg
czg
ulx
Expand Down Expand Up @@ -213952,12 +213948,12 @@ rfk
ulx
rfk
rfk
czg
ulx
czg
utW
utW
ulx
fZI
fZI
nTQ
nTQ
nTQ
nTQ
rYL
fqO
pEB
Expand Down Expand Up @@ -214209,12 +214205,12 @@ czg
ulx
czg
czg
czg
ulx
czg
fZI
fZI
nTQ
utW
jQP
utW
ulx
ulx
rYL
uUM
qCR
Expand Down Expand Up @@ -214466,14 +214462,14 @@ luc
luc
luc
czg
utW
utW
czg
czg
ulx
ulx
fZI
fZI
nTQ
msW
msW
msW
fqO
gYY
tnL
yfm
fqO
xJH
Expand Down Expand Up @@ -214723,14 +214719,14 @@ ulx
ulx
czg
ulx
ulx
ulx
ulx
czg
ulx
ulx
fZI
fZI
nTQ
msW
msW
msW
fqO
gYY
tnL
vxe
fqO
xJH
Expand Down Expand Up @@ -214980,16 +214976,16 @@ ulx
ulx
czg
ulx
gcg
gcg
gcg
mQV
mQV
mQV
jQP
gYY
jQP
rIj
fZI
nTQ
nTQ
msW
msW
msW
msW
tnL
msW
bDM
xJH
xPK
xPK
Expand Down Expand Up @@ -215238,14 +215234,14 @@ ulx
czg
ulx
wPl
wPl
wPl
gYY
gYY
gYY
gYY
gYY
jQP
tnL
tnL
tnL
tnL
tnL
tnL
msW
rIj
xJH
xPK
Expand Down Expand Up @@ -215495,13 +215491,13 @@ czg
czg
czg
wPl
rmU
nTQ
xGW
fsz
jQP
msW
nTQ
nTQ
bDM
msW
nTQ
nTQ
xJH
Expand Down Expand Up @@ -215752,13 +215748,13 @@ ulx
czg
ulx
wPl
rmU
nTQ
mBU
rYL
qtX
rYL
wwE
tnL
msW
leI
fqO
xJH
Expand Down Expand Up @@ -216009,7 +216005,7 @@ ulx
czg
ulx
wPl
rmU
nTQ
nEq
jFq
kpF
Expand Down Expand Up @@ -216266,10 +216262,10 @@ ulx
czg
ulx
wPl
ulx
ulx
ulx
ulx
nTQ
nTQ
nTQ
nTQ
nTQ
fIN
msW
Expand Down
Loading
Loading