Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
315 commits
Select commit Hold shift + click to select a range
7ef5c07
why no work
cowbot92 Dec 1, 2023
567ef0d
weird errors
cowbot92 Dec 1, 2023
b82a6cc
fixved it
cowbot92 Dec 1, 2023
0d2c511
fix?
cowbot92 Dec 1, 2023
ecaffbc
nope
cowbot92 Dec 1, 2023
c02d04a
no more immutable
cowbot92 Dec 1, 2023
ad15054
ok
cowbot92 Dec 1, 2023
63c418d
removes all the pref stuff
cowbot92 Dec 1, 2023
c389b27
remove this
cowbot92 Dec 1, 2023
54d5710
this goes bye
cowbot92 Dec 1, 2023
39b2fe2
these go too
cowbot92 Dec 1, 2023
f02183c
bye
cowbot92 Dec 1, 2023
f6add0a
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 1, 2023
bd3d632
better night vision
Moltijoe Dec 1, 2023
2d14fba
tries to fix camera
cowbot92 Dec 1, 2023
fed32a4
Merge branch 'NahI'dPortit' of https://github.com/cowbot92/Yogstation…
cowbot92 Dec 1, 2023
fece8d2
ok fuck it we ball
cowbot92 Dec 1, 2023
74aa73d
ok lets go back
cowbot92 Dec 1, 2023
f3ef0a6
WORK
cowbot92 Dec 1, 2023
561b45d
ha
cowbot92 Dec 1, 2023
d3826c1
this
cowbot92 Dec 1, 2023
c8a0914
this doesnt work :(
cowbot92 Dec 1, 2023
4fe889a
maybe fix
cowbot92 Dec 1, 2023
6095dec
fucks everything
cowbot92 Dec 1, 2023
6ba3220
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 1, 2023
7c91ede
test update
cowbot92 Dec 1, 2023
cf2d5f2
Revert "tries to fix camera"
cowbot92 Dec 1, 2023
d125f7f
Merge branch 'NahI'dPortit' of https://github.com/cowbot92/Yogstation…
cowbot92 Dec 1, 2023
4a37300
reverts everything I just did
cowbot92 Dec 1, 2023
a4d9e04
bye
cowbot92 Dec 1, 2023
77738b5
oh yeah add this
cowbot92 Dec 1, 2023
0e421eb
Fucks up the camera net + chunk
cowbot92 Dec 2, 2023
98c5ef1
test maybe revert
Moltijoe Dec 2, 2023
3cf31d0
Revert "test maybe revert"
Moltijoe Dec 2, 2023
4b3e35b
Revert "Fucks up the camera net + chunk"
cowbot92 Dec 2, 2023
1d8ceac
this isnt going well
cowbot92 Dec 3, 2023
78d861d
Attempts to rework out security camera
cowbot92 Dec 4, 2023
e26fb61
Revert "this isnt going well"
cowbot92 Dec 4, 2023
c0cf69e
Revert "Revert "this isnt going well""
cowbot92 Dec 4, 2023
0109473
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 4, 2023
7e7a7f8
ok
cowbot92 Dec 4, 2023
8068af0
Revert "ok"
cowbot92 Dec 4, 2023
b3fb3ba
Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPor…
cowbot92 Dec 4, 2023
56f1434
this doesn't need to be redefined
cowbot92 Dec 4, 2023
363820f
no we need this
cowbot92 Dec 4, 2023
778ea63
a familiar pain
Chubbygummibear Dec 4, 2023
9fc5529
Merge branch 'NahI'dPortit' of https://github.com/cowbot92/Yogstation…
Chubbygummibear Dec 4, 2023
dd5a154
515 is L
JohnFulpWillard Dec 4, 2023
002e042
Merge pull request #1 from JohnFulpWillard/515-sucks
cowbot92 Dec 4, 2023
14cc714
yeah
cowbot92 Dec 4, 2023
e414b8b
Merge branch 'NahI'dPortit' of https://github.com/cowbot92/Yogstation…
cowbot92 Dec 4, 2023
308489b
ok god
cowbot92 Dec 4, 2023
7ec2937
bye bye basemap :(
cowbot92 Dec 4, 2023
7a23215
Fixes AI statis not working
cowbot92 Dec 5, 2023
9fe6d9a
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 5, 2023
2204e3a
remove this
cowbot92 Dec 5, 2023
cb744eb
Revert "Revert "Merge remote-tracking branch 'upstream/master' into N…
cowbot92 Dec 5, 2023
d383311
proves to god I exist
cowbot92 Dec 5, 2023
841d19b
yog exclusive feature (tm)
cowbot92 Dec 5, 2023
443d5ca
bring this back from previous push
Moltijoe Dec 5, 2023
67c7c23
updates vendor emissives
cowbot92 Dec 5, 2023
4cbe963
Updates barsign
cowbot92 Dec 5, 2023
3df373e
Fixes barsigns breaks all lights and updates barsigns to be machines …
cowbot92 Dec 5, 2023
f23915d
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 5, 2023
37f2c3d
not sure who changed that
cowbot92 Dec 5, 2023
2347a80
yeah
cowbot92 Dec 5, 2023
5e9ed26
this needs updating
cowbot92 Dec 5, 2023
4ee9c16
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 6, 2023
e7a726b
turns off the carbon monoxide alarm
cowbot92 Dec 6, 2023
ca752c2
FIXES IT YES
cowbot92 Dec 6, 2023
0f55656
turns this off too
cowbot92 Dec 6, 2023
b395c25
Can't compile yet but ports a ton of shit
JohnFulpWillard Dec 6, 2023
558feac
L
JohnFulpWillard Dec 6, 2023
19aab78
the game opens ig
JohnFulpWillard Dec 6, 2023
d6ac28c
extra shit
JohnFulpWillard Dec 6, 2023
8683131
fixes
JohnFulpWillard Dec 6, 2023
39f7a9d
signals and smooth queue
JohnFulpWillard Dec 6, 2023
f64bece
look ma im going horribly out of scope
JohnFulpWillard Dec 6, 2023
78786de
fixes chasms
JohnFulpWillard Dec 6, 2023
85b0a32
this fixed nothing
JohnFulpWillard Dec 6, 2023
c12b970
???
JohnFulpWillard Dec 6, 2023
91f6b60
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 6, 2023
ee2d847
more barsigns
cowbot92 Dec 6, 2023
543605e
forgive me cowboy. also fuck diagonals
Chubbygummibear Dec 7, 2023
b99b406
Merge remote-tracking branch 'upstream/master' into NahI'dPortit
cowbot92 Dec 7, 2023
8248523
oops
cowbot92 Dec 7, 2023
4676f1e
fuck it we ball
JohnFulpWillard Dec 7, 2023
02c097b
Update _lists.dm
JohnFulpWillard Dec 7, 2023
126b5a0
Update icon_smoothing.dm
JohnFulpWillard Dec 7, 2023
0fff429
it now works kinda
JohnFulpWillard Dec 7, 2023
f6d806f
Update atom_initializing_EXPENSIVE.dm
JohnFulpWillard Dec 7, 2023
4b721b9
lighting don't work
Chubbygummibear Dec 9, 2023
6331816
Merge branch 'pr/21001' into icon_smoothing
Chubbygummibear Dec 9, 2023
45806f0
we have light
Chubbygummibear Dec 11, 2023
d63b90c
sort turfs better
Chubbygummibear Dec 11, 2023
743cfd8
big fucking reorganize
Chubbygummibear Dec 11, 2023
1ccd32f
like everything except templates
Chubbygummibear Dec 13, 2023
c1975ca
boy i sure hope nothing bad happens to these bar templates
Chubbygummibear Dec 14, 2023
167097c
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Dec 14, 2023
a442d63
we're back
Chubbygummibear Dec 14, 2023
a2a11d1
no runtimes baby
Chubbygummibear Dec 14, 2023
884623e
no errors
Chubbygummibear Dec 20, 2023
863e1b7
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Dec 20, 2023
0460588
shuttles are almost fixed i think
Chubbygummibear Dec 20, 2023
6d7f109
Revert "shuttles are almost fixed i think"
Chubbygummibear Dec 21, 2023
a8ff8d6
Revert "Merge remote-tracking branch 'upstream/master' into icon_smoo…
Chubbygummibear Dec 21, 2023
6509b22
Revert "no errors"
Chubbygummibear Dec 21, 2023
d8d3dec
too far back i think
Chubbygummibear Dec 21, 2023
773b928
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Dec 21, 2023
c1adce1
midround smoothing runtimes fixed i think
Chubbygummibear Dec 27, 2023
14a112b
comment cleanup
Chubbygummibear Dec 27, 2023
10c8655
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Dec 27, 2023
4ed5cc7
should fix the component runtimes
Chubbygummibear Dec 27, 2023
7de31ee
Revert "Revert "Merge remote-tracking branch 'upstream/master' into i…
Chubbygummibear Dec 27, 2023
a02ba32
NO RUNTIMES AND ICEMETA WORKS LET'S GOOOOOO
Chubbygummibear Dec 29, 2023
19de4be
please stay fixed icemeta
Chubbygummibear Dec 29, 2023
1455f4b
organizing render dms
Chubbygummibear Dec 29, 2023
b261a53
woops this too in the reorganizing
Chubbygummibear Dec 29, 2023
aac93ca
cryo fixed
Chubbygummibear Dec 30, 2023
92fb9e4
nah, i'd win
Chubbygummibear Jan 5, 2024
c5dba1b
parallax isn't my problem
Chubbygummibear Jan 8, 2024
15d582e
pls don't break icemeta
Chubbygummibear Jan 8, 2024
e99de66
runtime station gets a cam console
Chubbygummibear Jan 8, 2024
9e22c33
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 8, 2024
382ae6b
well it compiles
Chubbygummibear Jan 8, 2024
e20ffce
maybe fix the map
Chubbygummibear Jan 8, 2024
3923696
woops
Chubbygummibear Jan 8, 2024
c128803
man i hate maps
Chubbygummibear Jan 8, 2024
46826a5
was that it?
Chubbygummibear Jan 8, 2024
eedab77
PLEASE
Chubbygummibear Jan 8, 2024
7e21210
missing focus tests
Chubbygummibear Jan 8, 2024
3029f6b
maybe that was it
Chubbygummibear Jan 9, 2024
57211cf
maybe
Chubbygummibear Jan 9, 2024
8fb182b
let's take the batteries out of the carbon monoxide detector
Chubbygummibear Jan 9, 2024
1b26f33
fuck osha
Chubbygummibear Jan 9, 2024
36d98ab
i hate vending machines
Chubbygummibear Jan 9, 2024
6f63569
that's not a computer
Chubbygummibear Jan 9, 2024
1904373
slot machine fix
Chubbygummibear Jan 9, 2024
610d0e2
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 9, 2024
46affd4
PLEASE
Chubbygummibear Jan 9, 2024
d921c24
that wasn't supposed to be there
Chubbygummibear Jan 9, 2024
e0f7531
fuck it i can't fix everything at once
Chubbygummibear Jan 9, 2024
16c902a
BLUESPACE LOCKER?
Chubbygummibear Jan 9, 2024
3ef8d33
literally why
Chubbygummibear Jan 9, 2024
1c6fafc
hhh
Chubbygummibear Jan 9, 2024
6c5fbf1
does this fix chasms?
Chubbygummibear Jan 9, 2024
619280e
that should fix bad index
Chubbygummibear Jan 9, 2024
c746d62
please?
Chubbygummibear Jan 10, 2024
afe276d
turf_flags for reservations
Chubbygummibear Jan 10, 2024
c9c64ae
haha oops
Chubbygummibear Jan 10, 2024
5f2b6d1
yolo (kill me)
Chubbygummibear Jan 11, 2024
ea5dae2
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 11, 2024
e84597a
fix wood walls and other walls
Chubbygummibear Jan 15, 2024
40c923a
fix stairs
Chubbygummibear Jan 15, 2024
bda4ee7
that might have fixed shittles
Chubbygummibear Jan 17, 2024
1292f0d
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 17, 2024
fdb3347
baseturfs are good now i think
Chubbygummibear Jan 17, 2024
64dafa4
should fix plasma windows
Chubbygummibear Jan 17, 2024
f1e0974
decals fixed
Chubbygummibear Jan 17, 2024
c4f790c
please fix changelog
Chubbygummibear Jan 17, 2024
ed82cc2
shuttle lighting still fucky
Chubbygummibear Jan 17, 2024
ff13314
lighting is stinky slow and doesn't finish updating by the time the s…
Chubbygummibear Jan 17, 2024
a39b498
lighting seemingly works
Chubbygummibear Jan 18, 2024
ef13a5b
slipping works
Chubbygummibear Jan 18, 2024
b9b8068
shuttle sounds, slips, and windoors fixed
Chubbygummibear Jan 18, 2024
7f094e4
why am i here
Chubbygummibear Jan 18, 2024
b14ce0f
fuck the changelog
Chubbygummibear Jan 18, 2024
fe277b5
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 18, 2024
90d5547
of course someone touched smoothing as i'm almost done
Chubbygummibear Jan 18, 2024
18d652f
we good?
Chubbygummibear Jan 18, 2024
d2091a8
updating ai_eye and rename
Chubbygummibear Jan 19, 2024
c6da603
z updates and more ai cam updates
Chubbygummibear Jan 19, 2024
8aded94
ice fixed
Chubbygummibear Jan 19, 2024
dd48801
weather and ice fix
Chubbygummibear Jan 19, 2024
f89b1b5
clockies can see and other clean up catches
Chubbygummibear Jan 19, 2024
2775b15
windows fixed
Chubbygummibear Jan 19, 2024
a519ecf
cowbot forgive me i'm trying to update flashlights to tg because ther…
Chubbygummibear Jan 19, 2024
14214ac
movable lighting works on multi-z
Chubbygummibear Jan 22, 2024
6c25c2f
gps fix
Chubbygummibear Jan 22, 2024
006b3d8
item stacking from drag works
Chubbygummibear Jan 22, 2024
c643e3c
falsewall fix
Chubbygummibear Jan 22, 2024
ad8d29a
job panel fixed
Chubbygummibear Jan 24, 2024
500cc7c
AI HANDLED
Chubbygummibear Jan 24, 2024
27b2142
woops that comment should be gone
Chubbygummibear Jan 24, 2024
f45a56b
i hate ai i hate ai
Chubbygummibear Jan 26, 2024
fed2811
brass glass visible again
Chubbygummibear Jan 26, 2024
62b8aa5
vents on top of tiles now
Chubbygummibear Jan 26, 2024
c8d5562
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 26, 2024
88f65b8
sigdrobe sprite back
Chubbygummibear Jan 26, 2024
137391a
centcomm portals work
Chubbygummibear Jan 26, 2024
5821699
portals and see openspace mapping icons fixed
Chubbygummibear Jan 27, 2024
6ad56d8
icemeta my behated
Chubbygummibear Jan 27, 2024
b0a3251
kill
Chubbygummibear Jan 27, 2024
76167f1
is that it
Chubbygummibear Jan 28, 2024
684b78f
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 28, 2024
ab242dc
lighting cutoff is old hat
Chubbygummibear Jan 28, 2024
7b86936
angery overlay
Chubbygummibear Jan 28, 2024
f60222f
not super necessary
Chubbygummibear Jan 28, 2024
bc3cf5b
also extra but whatever
Chubbygummibear Jan 28, 2024
fddddbb
ticker but thicker
Chubbygummibear Jan 28, 2024
9a7fea8
job fix i hope
Chubbygummibear Jan 28, 2024
4ab53a4
this isn't needed anymore
Chubbygummibear Jan 28, 2024
5fc01a7
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 28, 2024
47538cd
latejoin fix?
Chubbygummibear Jan 29, 2024
9f204c6
laserpointer, pipecrawl, and some consoles fixed
Chubbygummibear Jan 30, 2024
2517f13
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Jan 30, 2024
d246c29
i hate fixing bugs as they're made
Chubbygummibear Jan 30, 2024
0d76cfc
we're not ready for that
Chubbygummibear Jan 30, 2024
229c51d
redef cleanup
Chubbygummibear Jan 30, 2024
cc97552
gps arrows, gun flashlights, shuttle console placement, multi-z pulli…
Chubbygummibear Feb 1, 2024
90aa8b0
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Feb 1, 2024
9deeec5
goofy ah gun code
Chubbygummibear Feb 1, 2024
08b8d6a
this was a good idea and necessary
Chubbygummibear Feb 7, 2024
7024df4
should fix caltrop component
Chubbygummibear Feb 7, 2024
6c195cd
does this please the linter
Chubbygummibear Feb 7, 2024
87f4ccf
linter please accept this async function
Chubbygummibear Feb 7, 2024
d66b72c
THERE
Chubbygummibear Feb 7, 2024
4f7a729
take the batteries out
Chubbygummibear Feb 7, 2024
899a051
make it stop
Chubbygummibear Feb 7, 2024
8033585
cowbot stopped me from letting ghosts dab
Chubbygummibear Feb 8, 2024
cf5d281
recycler loc fix
Chubbygummibear Feb 8, 2024
ebed297
fix border firedoors not blocking movement
Chubbygummibear Feb 8, 2024
b862a3f
should fix screen fade out and fade in on round start and end
Chubbygummibear Feb 9, 2024
9874123
darker command tile trim and fixed bronze wall sprites
Chubbygummibear Feb 9, 2024
e49c39b
fuck you linter
Chubbygummibear Feb 9, 2024
9ffb049
railings actually stop you from leaving
Chubbygummibear Feb 9, 2024
907678e
probably fixes gibtonite overlay when struck
Chubbygummibear Feb 9, 2024
dc31982
armaments dispenser and clockwork catwalk
Chubbygummibear Feb 10, 2024
44bada8
turbine fix probably
Chubbygummibear Feb 10, 2024
59fc3ca
pointing at inhand items should be fixed
Chubbygummibear Feb 10, 2024
cb7f983
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Feb 12, 2024
3de0953
fix overwatch app
Chubbygummibear Feb 13, 2024
ca73ab8
should hopefully fix cable rotation on shuttle move
Chubbygummibear Feb 13, 2024
9a4b330
flashlights have better directionality logic
Chubbygummibear Feb 13, 2024
a1a9167
hopefully fixes shuttle atmos on move
Chubbygummibear Feb 13, 2024
c8e2a90
grilles fixed
Chubbygummibear Feb 13, 2024
e81d103
hopefully this fixes shuttle buttons, airolocks, and other machinery …
Chubbygummibear Feb 13, 2024
7b34489
ice meta mining area finally not freezing
Chubbygummibear Feb 14, 2024
2aec495
fix lightbulb icons not updating
Chubbygummibear Feb 15, 2024
95256d6
lava mask and lighting dots
Chubbygummibear Feb 15, 2024
6c5a1cb
we actually have this
Chubbygummibear Feb 16, 2024
4bee6ce
fuck glowshrooms GC
Chubbygummibear Feb 17, 2024
a17b489
fix light fixture interactions and icon updates
Chubbygummibear Feb 18, 2024
1f5a0f0
hopefully catches all the updates
Chubbygummibear Feb 18, 2024
36e809c
lava lighting good to go
Chubbygummibear Feb 18, 2024
252cb0f
seclite was missing inhands
Chubbygummibear Feb 18, 2024
4806819
smoothing in replays
Chubbygummibear Feb 18, 2024
2a1e9b8
light updates accurate in replays
Chubbygummibear Feb 18, 2024
b8afa8e
biome's multi-z requests
Chubbygummibear Feb 18, 2024
ce3ad15
Merge remote-tracking branch 'upstream/master' into icon_smoothing
Chubbygummibear Feb 18, 2024
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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/guides/HARDDELETES.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ So then, we want to temporarily remember to clear a reference when it's deleted

This is where I might lose you, but we're gonna use signals

`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_PARENT_QDELETING`
`qdel()`, the proc that sets off this whole deletion business, sends a signal called `COMSIG_QDELETING`

We can listen for that signal, and if we hear it clear whatever reference we may have

Expand All @@ -255,10 +255,10 @@ Here's an example

/somemob/proc/set_target(new_target)
if(target)
UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared
UnregisterSignal(target, COMSIG_QDELETING) //We need to make sure any old signals are cleared
target = new_target
if(target)
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d
RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d

/somemob/proc/clear_target(datum/source)
SIGNAL_HANDLER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"s" = (
/obj/effect/decal/cleanable/trail_holder,
/obj/effect/decal/cleanable/blood/trail_holder,
/turf/open/floor/wood,
/area/ruin/unpowered)
"u" = (
Expand Down
3 changes: 1 addition & 2 deletions _maps/RandomRuins/IceRuins/icemoon_surface_syndicate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1697,8 +1697,7 @@
/area/ruin/syndicate_icemoon/medical)
"lY" = (
/obj/machinery/atmospherics/pipe/layer_manifold{
dir = 4;
level = 2
dir = 4
},
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/ruin/syndicate_icemoon/engine)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
/area/icemoon/underground/explored)
"ut" = (
/obj/item/flashlight/lantern{
on = 1
light_on = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper/secretrecipe,
/obj/item/flashlight/lantern/jade{
on = 1
light_on = 1
},
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered/buried_library)
Expand Down Expand Up @@ -344,7 +344,7 @@
/area/icemoon/underground/explored)
"bz" = (
/obj/item/flashlight/lantern/jade{
on = 1
light_on = 1
},
/turf/open/floor/plating,
/area/ruin/unpowered/buried_library)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/area/template_noop)
"f" = (
/obj/item/flashlight/lantern{
on = 1
light_on = 1
},
/turf/open/floor/plating/ice/icemoon,
/area/icemoon/underground/explored)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
/area/template_noop)
"A" = (
/obj/structure/window/paperframe{
CanAtmosPass = 0
can_atmos_pass = 0
},
/turf/open/floor/wood/jungle,
/area/template_noop)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
/area/jungleland/explored)
"ai" = (
/obj/item/flashlight/lantern{
on = 1
light_on = 1
},
/turf/open/indestructible/grass,
/area/ruin/unpowered/ivymen)
Expand All @@ -50,7 +50,7 @@
/turf/open/floor/plating/dirt/jungleland/jungle,
/area/ruin/unpowered/ivymen)
"al" = (
/turf/closed/indestructible/rock/wood,
/turf/closed/indestructible/wood,
/area/ruin/unpowered/ivymen)
"am" = (
/obj/machinery/iv_drip,
Expand Down Expand Up @@ -214,7 +214,7 @@
/area/ruin/unpowered/ivymen)
"uo" = (
/obj/item/flashlight/lantern{
on = 1
light_on = 1
},
/turf/open/floor/plating/dirt/jungleland/jungle,
/area/jungleland/explored)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"t" = (
/obj/structure/stone_tile/slab,
/obj/item/flashlight/lantern{
on = 1
light_on = 1
},
/turf/open/floor/plating/dirt/jungleland/barren_rocks,
/area/ruin/unpowered/tar_temple)
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungleland_jungle_xenos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
/turf/open/floor/plating/dirt/jungleland/jungle,
/area/template_noop)
"aV" = (
/turf/closed/indestructible/rock/wood,
/turf/closed/indestructible/wood,
/area/ruin/unpowered)
"aW" = (
/obj/structure/flora/grass/jungle/b,
Expand Down Expand Up @@ -218,7 +218,7 @@
/turf/open/floor/plating/dirt/jungleland/jungle,
/area/ruin/unpowered)
"uP" = (
/turf/closed/indestructible/rock/wood,
/turf/closed/indestructible/wood,
/area/template_noop)
"vl" = (
/obj/structure/mineral_door/wood,
Expand Down Expand Up @@ -275,7 +275,7 @@
/obj/structure/sign/warning{
desc = "A warning sign denoting landmines ahead."
},
/turf/closed/indestructible/rock/wood,
/turf/closed/indestructible/wood,
/area/template_noop)
"Ou" = (
/obj/structure/alien/weeds,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3752,7 +3752,7 @@
dir = 4;
dwidth = 5;
height = 5;
id = "syndicatelavalandbase_cargo";
shuttle_id = "syndicatelavalandbase_cargo";
name = "Syndicate Jungle Base: Cargo Bay Dock";
width = 11
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/miningbase.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2271,7 +2271,7 @@
dir = 8;
dwidth = 3;
height = 5;
id = "mining_away";
shuttle_id = "mining_away";
name = "lavaland mine";
width = 7
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
/turf/open/floor/plating/beach/sand,
/area/ruin/powered/beach)
"bg" = (
/obj/structure/sign/barsign,
/obj/machinery/barsign,
/turf/closed/wall/mineral/sandstone,
/area/ruin/powered/beach)
"bl" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"aF" = (
/obj/item/reagent_containers/glass/bottle/radscrub{
desc = "War. War never changes. But this can clean your radiation contamination problems!";

},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
Expand Down Expand Up @@ -442,7 +443,7 @@
/turf/open/floor/plasteel/lavaland,
/area/ruin/powered)
"FQ" = (
/obj/structure/sign/barsign{
/obj/machinery/barsign{
icon_state = "maltesefalcon"
},
/turf/closed/wall/r_wall/rust,
Expand Down
24 changes: 12 additions & 12 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
name = "Broken Computer"
},
/obj/effect/decal/cleanable/glass,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"da" = (
/turf/open/floor/pod/dark,
Expand All @@ -43,7 +43,7 @@
/turf/open/floor/plating,
/area/ruin/powered/golem_ship)
"fy" = (
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"gl" = (
/obj/effect/decal/cleanable/dirt,
Expand All @@ -59,7 +59,7 @@
"hk" = (
/obj/effect/mob_spawn/human/golem/adamantine,
/obj/effect/decal/cleanable/cobweb,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"hB" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -274,7 +274,7 @@
/obj/effect/mob_spawn/human/golem/adamantine,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"xc" = (
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -378,7 +378,7 @@
/area/ruin/powered/golem_ship)
"Dq" = (
/obj/effect/mob_spawn/human/golem/adamantine,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"Dw" = (
/obj/structure/table/reinforced,
Expand Down Expand Up @@ -480,7 +480,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"Iu" = (
/obj/structure/frame/computer,
Expand Down Expand Up @@ -526,7 +526,7 @@
/area/ruin/powered/golem_ship)
"Ls" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"LB" = (
/obj/effect/decal/cleanable/oil,
Expand All @@ -549,7 +549,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/glass,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"MH" = (
/obj/machinery/light/small{
Expand Down Expand Up @@ -593,7 +593,7 @@
/obj/machinery/light{
dir = 8
},
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"Ox" = (
/obj/structure/frame/machine,
Expand All @@ -604,7 +604,7 @@
"OL" = (
/obj/item/resonator,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"OZ" = (
/turf/open/floor/plating,
Expand All @@ -618,7 +618,7 @@
/obj/structure/chair/office/dark{
dir = 8
},
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"Pt" = (
/obj/machinery/light/broken{
Expand Down Expand Up @@ -653,7 +653,7 @@
/area/ruin/powered/golem_ship)
"Qd" = (
/obj/item/resonator,
/turf/open/floor/carpet/exoticpurple,
/turf/open/floor/carpet/purple,
/area/ruin/powered/golem_ship)
"Qu" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/turf/closed/wall/mineral/titanium/survival,
/area/lavaland/surface/outdoors)
"np" = (
/turf/closed/mineral/gibtonite/volcanic/hard/harder,
/turf/closed/mineral/gibtonite/volcanic/harder,
/area/lavaland/surface/outdoors)
"nL" = (
/obj/structure/stone_tile/surrounding_tile{
Expand Down Expand Up @@ -354,10 +354,10 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"CI" = (
/turf/closed/mineral/diamond/volcanic/hard/harder,
/turf/closed/mineral/diamond/volcanic/harder,
/area/lavaland/surface/outdoors)
"Di" = (
/turf/closed/mineral/bananium/volcanic/hard/harder,
/turf/closed/mineral/bananium/volcanic/harder,
/area/lavaland/surface/outdoors)
"EO" = (
/obj/structure/stone_tile,
Expand Down Expand Up @@ -540,7 +540,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"SX" = (
/turf/closed/mineral/gem/volcanic/hard/harder,
/turf/closed/mineral/gem/volcanic/harder,
/area/lavaland/surface/outdoors)
"Tf" = (
/obj/effect/decal/remains/xeno,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@
/turf/open/lava/smooth/lava_land_surface,
/area/ruin/unpowered)
"ty" = (
/turf/closed/mineral/magmite/volcanic/hard/harder,
/turf/closed/mineral/magmite/volcanic/harder,
/area/ruin/unpowered)
"ud" = (
/obj/item/storage/bag/money/vault{
Expand Down Expand Up @@ -1032,7 +1032,7 @@
/turf/open/lava/smooth/lava_land_surface,
/area/ruin/unpowered)
"yj" = (
/turf/closed/mineral/volcanic/lava_land_surface/hard/harder,
/turf/closed/mineral/volcanic/lava_land_surface/harder,
/area/ruin/unpowered)
"yn" = (
/obj/structure/stone_tile/block{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_surface_maze.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"h" = (
/turf/closed/mineral/volcanic/lava_land_surface/hard/harder,
/turf/closed/mineral/volcanic/lava_land_surface/harder,
/area/template_noop)
"i" = (
/turf/closed/mineral/volcanic/lava_land_surface/hard,
Expand Down
Loading