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.

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

[IDB IGNORE] Heretic, ported from TG. #27873

Open
wants to merge 220 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
220 commits
Select commit Hold shift + click to select a range
a130ab1
auugh
Qwertytoforty Jan 3, 2025
dfd1441
every day we stray further from sanity
Qwertytoforty Jan 3, 2025
55289e4
more changes
Qwertytoforty Jan 4, 2025
964aa49
added missing haunted longsword, added 50 errors
Qwertytoforty Jan 5, 2025
af02176
more progress
Qwertytoforty Jan 6, 2025
b709848
Update code/modules/antagonists/heretic/heretic_antag.dm
Qwertytoforty Jan 9, 2025
b0f0787
more changes
Qwertytoforty Jan 10, 2025
7171616
more bullshit, no more sleeping
Qwertytoforty Jan 11, 2025
368550a
more shit
Qwertytoforty Jan 12, 2025
c30fd4d
more stuff before rust gets mergefd
Qwertytoforty Jan 12, 2025
13e82f5
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Jan 12, 2025
e3ce69c
rust stuff
Qwertytoforty Jan 12, 2025
287d3de
more shit
Qwertytoforty Jan 12, 2025
fd491b7
auugh
Qwertytoforty Jan 13, 2025
142b8a4
more shit
Qwertytoforty Jan 13, 2025
19f4d33
file not needed
Qwertytoforty Jan 13, 2025
8d5b674
auuguhghghg
Qwertytoforty Jan 15, 2025
844a341
sdfsfsdf
Qwertytoforty Jan 16, 2025
2d40dec
remove this
Qwertytoforty Jan 17, 2025
88f2c85
every day I worry all day
Qwertytoforty Jan 17, 2025
2509d65
below 1500
Qwertytoforty Jan 17, 2025
8521f61
1393 errors
Qwertytoforty Jan 17, 2025
d448cd7
1310
Qwertytoforty Jan 17, 2025
d35a2d3
1191 errors
Qwertytoforty Jan 18, 2025
ccb4707
1129
Qwertytoforty Jan 18, 2025
c86b71b
960
Qwertytoforty Jan 18, 2025
3789475
868
Qwertytoforty Jan 18, 2025
f94e319
701. free my soul
Qwertytoforty Jan 18, 2025
21e4298
31
Qwertytoforty Jan 19, 2025
498c7ab
y2HVdB4QQPw
Qwertytoforty Jan 19, 2025
7cb4a27
spell icon code should be FUCKING SHOT
Qwertytoforty Jan 19, 2025
dbed587
fuck tgui and the hill it lives on and spells and-
Qwertytoforty Jan 19, 2025
1522947
auuguhghughuguhgu
Qwertytoforty Jan 19, 2025
16b4a9b
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Jan 19, 2025
a119fce
fixes this
Qwertytoforty Jan 19, 2025
4d4fb1b
TGUI WOOOORKKSK
Qwertytoforty Jan 19, 2025
1a5277e
Update ash_jaunt.dm
Qwertytoforty Jan 19, 2025
fb722bd
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Jan 19, 2025
25c65e6
more sht
Qwertytoforty Jan 20, 2025
a435ef8
influences, effects, better spells, sprite fixes
Qwertytoforty Jan 20, 2025
71090d7
more bullshit
Qwertytoforty Jan 20, 2025
95ce765
ifugbuiygbui
Qwertytoforty Jan 21, 2025
c045483
more stuff
Qwertytoforty Jan 21, 2025
4234491
sacrifice map
Qwertytoforty Jan 21, 2025
32c5f2e
2 working ascensions. Pog
Qwertytoforty Jan 22, 2025
3f5c781
MORE SHIT
Qwertytoforty Jan 22, 2025
3a16565
STRIKE
Qwertytoforty Jan 23, 2025
e6c968b
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Jan 23, 2025
e619b29
more progress
Qwertytoforty Jan 23, 2025
0b9f342
prrrrrrrrrrrogresssss
Qwertytoforty Jan 23, 2025
ce92813
bundle rebuild
Burzah Jan 23, 2025
6e27772
void pull test
Qwertytoforty Jan 23, 2025
db953dd
test if it's extended
Qwertytoforty Jan 23, 2025
9fd91f3
retesting
Qwertytoforty Jan 23, 2025
40ae935
flashing blades
Qwertytoforty Jan 23, 2025
7050c98
Different turfs for void conduit
DGamerL Jan 24, 2025
ca1d79e
auuugh
Qwertytoforty Jan 24, 2025
b4dd50c
more bullshiot
Qwertytoforty Jan 26, 2025
ce97c3b
lkjfdolkgnmolikdn
Qwertytoforty Jan 27, 2025
c6dbc73
KALI-MAH
Qwertytoforty Jan 30, 2025
0a559b5
the W O R M
Qwertytoforty Jan 31, 2025
1609a16
oops
Qwertytoforty Jan 31, 2025
8b5f1a1
darker yet darker
Qwertytoforty Jan 31, 2025
7458a98
other stuff
Qwertytoforty Feb 1, 2025
b1ac017
removes it to update
Qwertytoforty Feb 1, 2025
884959f
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 1, 2025
b0d7c3b
tgui
Qwertytoforty Feb 1, 2025
c4b5a75
remap CC, fix sacrifice organs
Qwertytoforty Feb 1, 2025
e935e32
oooh you want to pass ci oooh
Qwertytoforty Feb 1, 2025
8d97137
this is duplicated on tg too
Qwertytoforty Feb 1, 2025
80eabf5
fireball
Qwertytoforty Feb 1, 2025
3526b07
new attack moment
Qwertytoforty Feb 1, 2025
9d4e182
hijack check + small tgui tweak
Qwertytoforty Feb 2, 2025
a6b3a96
AND THIS
Qwertytoforty Feb 3, 2025
e30d619
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 3, 2025
04dbd0e
extra cooldown before tm
Qwertytoforty Feb 3, 2025
b65b4c3
tgui polish
Burzah Feb 3, 2025
efb700d
easier void, flowers
Qwertytoforty Feb 3, 2025
8ca9c9c
delta didn't need it
Qwertytoforty Feb 3, 2025
5bb7884
yeag
Qwertytoforty Feb 3, 2025
7131e7d
Add department targeting to sacrifices
DGamerL Feb 3, 2025
c3f6da4
Merge branch 'heretic.-What-more-is-there-to-say-' of https://github.…
DGamerL Feb 3, 2025
2b4ef0e
woe, pen and formating apon thee
Qwertytoforty Feb 3, 2025
e2e2f52
oh whoosp
Qwertytoforty Feb 3, 2025
85f80c5
more cold fix
Qwertytoforty Feb 3, 2025
e94541a
Update code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
Qwertytoforty Feb 3, 2025
e25fbd3
one other fix
Qwertytoforty Feb 3, 2025
4268d7b
Merge branch 'heretic.-What-more-is-there-to-say-' of https://github.…
Qwertytoforty Feb 3, 2025
cb1c398
Nullcheck
DGamerL Feb 3, 2025
e21f2cf
Merge branch 'heretic.-What-more-is-there-to-say-' of https://github.…
DGamerL Feb 3, 2025
e703c26
whooopsie
Qwertytoforty Feb 3, 2025
d619487
Apply suggestions from code review
Qwertytoforty Feb 3, 2025
4e214df
lewcs changes
Qwertytoforty Feb 3, 2025
e2eed3e
16 == 21
Qwertytoforty Feb 4, 2025
6d3aa39
0.5 to 1.5
Qwertytoforty Feb 4, 2025
2bfdb71
VOMIT FIX
Qwertytoforty Feb 4, 2025
b95da69
more fixes
Qwertytoforty Feb 4, 2025
ffbc2f4
speak and spell
Qwertytoforty Feb 4, 2025
da2f3f7
REPOST FIX
Qwertytoforty Feb 4, 2025
b4887df
spelling
Qwertytoforty Feb 4, 2025
1b8f6c0
head objective runtime
Qwertytoforty Feb 4, 2025
20c64fa
more spelling
Qwertytoforty Feb 4, 2025
d9c59d7
fix ipcs
Qwertytoforty Feb 4, 2025
122d66b
extra magic
Qwertytoforty Feb 4, 2025
01edcf1
fixes and non locis
Qwertytoforty Feb 4, 2025
85d41d1
fix / tweak
Qwertytoforty Feb 4, 2025
1099e8b
parade fix for if it is fired from the funny crystall
Qwertytoforty Feb 4, 2025
26269c0
final tm changes
Qwertytoforty Feb 4, 2025
908bacc
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 4, 2025
bc723d4
css change
Qwertytoforty Feb 4, 2025
4eac7d3
fixes / cult stuff
Qwertytoforty Feb 5, 2025
9ca2c35
blood siphon fix
Qwertytoforty Feb 5, 2025
bf06854
space crawl glass floors
Qwertytoforty Feb 5, 2025
86923d9
Rust fix
Qwertytoforty Feb 5, 2025
44d2a63
Adds `cover_flags2body_zones()` proc
Spaghetti-bit Feb 5, 2025
c5f9fa7
Murders comment on `special_projectiles.dm` @ line 409
Spaghetti-bit Feb 5, 2025
fbc5a86
CI lint error
Spaghetti-bit Feb 5, 2025
8ceb68b
Formatting + `storage_item.name`
Spaghetti-bit Feb 5, 2025
4c0c9dc
this 96 second old commit still makes the attack chain the old fashio…
Qwertytoforty Feb 5, 2025
0cd0ce1
An evil maniacs got to do what an evil maniacs gotta do
Qwertytoforty Feb 5, 2025
2539d59
href protection + spelling fix
Contrabang Feb 5, 2025
b21b65a
Merge branch 'heretic.-What-more-is-there-to-say-' of github.com:Qwer…
Contrabang Feb 5, 2025
92a364f
woe star gazer be apon thee
Qwertytoforty Feb 5, 2025
9013f1b
Merge branch 'heretic.-What-more-is-there-to-say-' of https://github.…
Qwertytoforty Feb 5, 2025
7000a72
remove comment
Qwertytoforty Feb 5, 2025
8263402
lets freeze less people to death
Qwertytoforty Feb 5, 2025
7850dfa
fade out
Qwertytoforty Feb 5, 2025
b184f42
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 5, 2025
3d6a76b
userdanger
Qwertytoforty Feb 6, 2025
55159c2
cult hand fixedm sword fix
Qwertytoforty Feb 6, 2025
481caa2
blood siphon fix for real
Qwertytoforty Feb 6, 2025
ebf960c
please god let me do this
Qwertytoforty Feb 6, 2025
739b2fc
IPCS, SWORDS, HUDS, AND AURA HEALING, OH MY
Qwertytoforty Feb 6, 2025
907a95a
the thing no longer needs to be done
Qwertytoforty Feb 6, 2025
5bea9ce
tgui tweak
Qwertytoforty Feb 6, 2025
7156f36
layers, space crawl, and focusing swords
Qwertytoforty Feb 6, 2025
bc587bc
make it bottle vs beaker, inventory code moment
Qwertytoforty Feb 6, 2025
41eef54
meet the sniper, feel the cold
Qwertytoforty Feb 6, 2025
39b8a1c
dumb, stupid, I could have sworn I pressed compile on the has_trait
Qwertytoforty Feb 6, 2025
ad8cd89
Days go by しょうがない Moments pass Shattered glass Hands of time Where's …
Qwertytoforty Feb 7, 2025
a001c3e
I already made the my time shattered glass joke
Qwertytoforty Feb 7, 2025
6538c9c
Removal of pens / crayons in permabrig, to meet balances request
Qwertytoforty Feb 7, 2025
3338216
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 7, 2025
16d5dd8
whoops stamina moment
Qwertytoforty Feb 7, 2025
df1fd26
jarvis half the blood healing
Qwertytoforty Feb 7, 2025
1f8859d
real fake medalions
Qwertytoforty Feb 7, 2025
21b2967
fix crimson again
Qwertytoforty Feb 7, 2025
d180501
better icons
Qwertytoforty Feb 7, 2025
f57ffa9
no longer instantly die with no blood on heretic runes
Qwertytoforty Feb 7, 2025
93c5f97
a timer never fails
Qwertytoforty Feb 7, 2025
8632b6b
heretic end of round
Qwertytoforty Feb 8, 2025
658ef83
we don't care about buckled
Qwertytoforty Feb 8, 2025
e9a13ed
yes this is prob 90 moment sorry
Qwertytoforty Feb 8, 2025
6dccf7f
actually fuck that just pull it out
Qwertytoforty Feb 8, 2025
dbe638f
oops
Qwertytoforty Feb 8, 2025
9466fe1
oh right the sound
Qwertytoforty Feb 8, 2025
98d85a7
feast of owls on cult, coin flip while moving
Qwertytoforty Feb 8, 2025
7e70823
voice of god
Qwertytoforty Feb 8, 2025
1d0509d
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 8, 2025
83abbca
she lazy on my loads till I cordon
Qwertytoforty Feb 8, 2025
116145c
not needed
Qwertytoforty Feb 8, 2025
f7a2edb
KILL
Qwertytoforty Feb 8, 2025
3def62c
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 8, 2025
54f9ec0
Weight increased by 1 to account for heretic
Qwertytoforty Feb 8, 2025
8a5f3fb
take it back there y'all
Qwertytoforty Feb 8, 2025
2c9c567
REVERSE REVERSE
Qwertytoforty Feb 8, 2025
1ad13c3
and take one off
Qwertytoforty Feb 8, 2025
aa1c46a
"THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!
Qwertytoforty Feb 9, 2025
fec7b19
other fix
Qwertytoforty Feb 9, 2025
be33a67
fix for bound movement
Qwertytoforty Feb 9, 2025
68b629b
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 9, 2025
f432990
fixes
Qwertytoforty Feb 9, 2025
c3172d9
fuck my stupid chungus life
Qwertytoforty Feb 9, 2025
18a0a39
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 9, 2025
20a3c46
Minion limit, heal fix, dead sac fix
Qwertytoforty Feb 9, 2025
7aa102a
cooldown, no sacrificing star gazer or ascended alive heretics
Qwertytoforty Feb 10, 2025
4c1478f
blade debuff
Qwertytoforty Feb 10, 2025
2411b2c
oopsy
Qwertytoforty Feb 11, 2025
e5506c7
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 11, 2025
bb148e3
Update tgui.bundle.js
Qwertytoforty Feb 11, 2025
4def058
map diff bot what ya doing
Qwertytoforty Feb 11, 2025
ba33c95
fuck that chat spam
Qwertytoforty Feb 11, 2025
43b5d68
lets heretic armour hold a haunted longsword
Qwertytoforty Feb 12, 2025
ea40a74
why not it makes sense
Qwertytoforty Feb 12, 2025
d4a2b05
do_after
Qwertytoforty Feb 12, 2025
5633411
god I hate this bullshit
Qwertytoforty Feb 12, 2025
4cbb1f8
other lewc stuff
Qwertytoforty Feb 12, 2025
b437276
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 12, 2025
4b6d22e
push
Qwertytoforty Feb 12, 2025
a70de19
heretic id card fix
Qwertytoforty Feb 13, 2025
34634d9
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 13, 2025
562aaa4
she tg on my ui till I css
Qwertytoforty Feb 13, 2025
4f425a7
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 13, 2025
b1737b8
yes
Qwertytoforty Feb 13, 2025
93f8b50
spent
Qwertytoforty Feb 13, 2025
d071ee2
fix / ipc buff (real):tm:
Qwertytoforty Feb 13, 2025
ba6a5b3
various fix / changes
Qwertytoforty Feb 16, 2025
99deb67
lost this when I made the carp pr
Qwertytoforty Feb 16, 2025
7ad5044
heretic species sprites by Drakeven!
Qwertytoforty Feb 16, 2025
58e6e8d
thermals for me and not for thee
Qwertytoforty Feb 17, 2025
1dd7b61
req rust changes / blade changes / sacrifice changes
Qwertytoforty Feb 21, 2025
c646b98
swaps coin from 3 to 1
Qwertytoforty Feb 21, 2025
f1e25df
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Feb 23, 2025
4e4bb6c
and src
Qwertytoforty Feb 23, 2025
f7a74a6
and this
Qwertytoforty Feb 23, 2025
a2295b6
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Mar 1, 2025
0763c1a
Update cult_items.dm
Qwertytoforty Mar 1, 2025
e007640
there we go
Qwertytoforty Mar 1, 2025
90112cf
20 -> 30
Qwertytoforty Mar 2, 2025
79b163d
bigger
Qwertytoforty Mar 2, 2025
84005de
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Mar 3, 2025
9d64c23
eyes
Qwertytoforty Mar 4, 2025
ae506e4
better fix
Qwertytoforty Mar 4, 2025
6d334ef
desc updated
Qwertytoforty Mar 4, 2025
f1f04b1
oops
Qwertytoforty Mar 5, 2025
1de8bff
Update misc_reagents.dm
Qwertytoforty Mar 5, 2025
63f4290
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Mar 5, 2025
b844f23
fucking FAKE ASS DEATH
Qwertytoforty Mar 6, 2025
2331f85
Merge remote-tracking branch 'upstream/master' into heretic.-What-mor…
Qwertytoforty Mar 6, 2025
2b2ca9b
hidden, soap
Qwertytoforty Mar 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5,238 changes: 2,619 additions & 2,619 deletions _maps/map_files/generic/centcomm.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/map_files/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12904,6 +12904,8 @@
/obj/item/seeds/wheat,
/obj/item/seeds/watermelon,
/obj/item/seeds/tower,
/obj/item/seeds/poppy,
/obj/item/seeds/harebell,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
"aTB" = (
Expand Down Expand Up @@ -82853,8 +82855,6 @@
/area/station/science/toxins/mixing)
"vMJ" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 1
Expand Down
3 changes: 1 addition & 2 deletions _maps/map_files/stations/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5703,6 +5703,7 @@
/obj/item/reagent_containers/spray/pestspray,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/glass/bottle/nutrient/mut,
/obj/item/seeds/harebell,
/turf/simulated/floor/grass/jungle,
/area/station/hallway/secondary/garden)
"aYc" = (
Expand Down Expand Up @@ -41685,8 +41686,6 @@
/area/station/maintenance/port2)
"hGA" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"hGE" = (
Expand Down
37 changes: 4 additions & 33 deletions _maps/map_files/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -58096,7 +58096,6 @@
/area/station/security/storage)
"eSW" = (
/obj/structure/table,
/obj/item/storage/fancy/crayons,
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
pixel_x = 28
Expand Down Expand Up @@ -82159,26 +82158,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"sqE" = (
/obj/machinery/door/airlock/security/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/security/permabrig)
"sqF" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
Expand Down Expand Up @@ -85773,8 +85752,6 @@
/area/station/security/brig)
"ugj" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/obj/machinery/atmospherics/unary/outlet_injector/on{
dir = 4
},
Expand Down Expand Up @@ -91024,12 +91001,6 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/effect/mapping_helpers/airlock/access/all/security/brig,
/obj/effect/mapping_helpers/airlock/autoname,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -146334,12 +146305,12 @@ vLP
sGs
aJx
aJx
sqE
bkd
wWV
aJx
aJx
aJx
uOS
wWV
bkd
aJx
ygH
ygH
aaa
Expand Down
11 changes: 2 additions & 9 deletions _maps/map_files/stations/emeraldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20046,13 +20046,6 @@
icon_state = "dark"
},
/area/station/turret_protected/ai)
"eaY" = (
/obj/structure/table,
/obj/item/storage/fancy/crayons,
/turf/simulated/floor/plasteel{
icon_state = "red"
},
/area/station/security/permabrig)
"ebg" = (
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -34525,7 +34518,6 @@
/area/station/command/office/ntrep)
"gTg" = (
/obj/structure/table,
/obj/item/storage/fancy/crayons,
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
Expand Down Expand Up @@ -47090,6 +47082,7 @@
/obj/item/food/grown/grapes,
/obj/item/food/grown/apple,
/obj/item/grown/corncob,
/obj/item/seeds/harebell,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "greenblue"
Expand Down Expand Up @@ -170405,7 +170398,7 @@ eTO
pmI
xhr
mIj
eaY
gLW
eTx
xnS
vHR
Expand Down
22 changes: 20 additions & 2 deletions _maps/map_files/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20612,6 +20612,8 @@
/obj/item/reagent_containers/glass/bottle/nutrient/ez,
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/reagent_containers/glass/bottle/nutrient/mut,
/obj/item/seeds/poppy,
/obj/item/seeds/harebell,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/garden)
"bBN" = (
Expand Down Expand Up @@ -56739,6 +56741,15 @@
name = "Prison Intercom (General)";
pixel_x = 25
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen{
pixel_x = 9;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
Expand Down Expand Up @@ -63612,8 +63623,6 @@
/area/station/security/brig)
"nCR" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"nDb" = (
Expand Down Expand Up @@ -76139,6 +76148,15 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -3;
pixel_y = 7
},
/obj/item/pen{
pixel_x = 9;
pixel_y = 8
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
Expand Down
Loading