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

oshan coding the sequel #374

Merged
merged 59 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
2e2f1db
hotspots now no longer breach floors
dwasint Sep 20, 2023
eda28c9
replaces returns with breaks
dwasint Sep 20, 2023
40eb40f
when i get to the pearly gates im gonna have a word with jod
dwasint Sep 21, 2023
57a3c1f
admins should know when a despawn happens, trench ladders, pit cleanup
dwasint Sep 21, 2023
8d7bafc
breaching charges
dwasint Sep 21, 2023
1f491b6
cleanses bad members
dwasint Sep 22, 2023
a2f52df
Update cargo_driver.dm
dwasint Sep 22, 2023
b29fc02
boosts heat costs of explosions massively
dwasint Sep 22, 2023
9b439f2
Update hotspot.dm
dwasint Sep 22, 2023
3df1360
adds the two other challenges to the game
dwasint Sep 22, 2023
c34439c
liquid runtime cleanup
dwasint Sep 22, 2023
206953b
more fixes
dwasint Sep 22, 2023
6decfab
forgot to undo this
dwasint Sep 22, 2023
05a7817
ghost respawning in CC
dwasint Sep 23, 2023
be5cd0e
aslong as not gibbed send back to spawn and heal
dwasint Sep 23, 2023
40c9c2b
checks if area exists for linters
dwasint Sep 23, 2023
558f33b
womp womp
dwasint Sep 23, 2023
3876c4e
base map support with assets
dwasint Sep 23, 2023
4221619
fixes
dwasint Sep 23, 2023
032080c
testing sometihng
dwasint Sep 23, 2023
df8adad
Update arena_cleanser.dm
dwasint Sep 23, 2023
fd7880b
Update arena_cleanser.dm
dwasint Sep 23, 2023
1cc18ec
Update arena_cleanser.dm
dwasint Sep 23, 2023
58f5a04
should be a working
dwasint Sep 23, 2023
9e9e919
ffs
dwasint Sep 23, 2023
24a944a
more fixes
dwasint Sep 23, 2023
ee1c321
TYPE_PROC over PROC_REf
dwasint Sep 23, 2023
1459348
more fixes
dwasint Sep 23, 2023
fa95d15
Update fight_button.dm
dwasint Sep 23, 2023
f6588c9
grah
dwasint Sep 23, 2023
34068ed
desc aswell
dwasint Sep 23, 2023
6f041d9
fixes arena spawning
dwasint Sep 23, 2023
5557163
tons of CC fixes
dwasint Sep 23, 2023
1429c02
fixes leaving duels
dwasint Sep 23, 2023
39b9563
adds injured spawner to medbay in CC, makes ghost players respawn whe…
dwasint Sep 23, 2023
49178dd
Update injured_spawner.dm
dwasint Sep 23, 2023
02f437b
adds a generative template for base botany mutations
dwasint Sep 23, 2023
8e83bdc
chef food machine, organ fabricator, hydroponics helper
dwasint Sep 24, 2023
0848924
adds botanical lexicons and watering cans to centcomm
dwasint Sep 24, 2023
4839c54
adds admin proc to ghost players
dwasint Sep 24, 2023
8932aaa
should stop cryo'd stuff
dwasint Sep 24, 2023
84bb482
lets people know they are disconnected from mind and recovery is likely
dwasint Sep 24, 2023
621832f
neon arena fix
dwasint Sep 24, 2023
d99ae01
new rails god damn
dwasint Sep 25, 2023
b1945f7
Revert "new rails god damn"
dwasint Sep 25, 2023
3d16c3d
Revert "new rails god damn"
dwasint Sep 25, 2023
6fb8611
Update railing.dm
dwasint Sep 25, 2023
8fb8cfa
plane fix
dwasint Sep 25, 2023
2cf2df8
fixes
dwasint Sep 25, 2023
84746d7
railing fixes
dwasint Sep 25, 2023
f56218b
Update CentCom.dmm
dwasint Sep 25, 2023
6a7deab
basic fish mob
dwasint Sep 25, 2023
6ac3fd1
tranqulity shuttle
dwasint Sep 25, 2023
7655f3f
fesh
dwasint Sep 26, 2023
93af49a
Update DeltaStation2.dmm
dwasint Sep 26, 2023
e21f655
Update hair.dmi
dwasint Sep 26, 2023
cb6de76
should fix cleanse and exposure lag
dwasint Sep 26, 2023
757cb2c
oshan blocked
dwasint Sep 26, 2023
eae7e63
removes egg
dwasint Sep 26, 2023
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
647 changes: 312 additions & 335 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

686 changes: 139 additions & 547 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26881,7 +26881,10 @@
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"jLG" = (
/obj/structure/railing/corner,
/obj/structure/railing{
dir = 4;
layer = 4.1
},
/turf/open/floor/plating/airless,
/area/space/nearstation)
"jMo" = (
Expand Down Expand Up @@ -29940,9 +29943,6 @@
/turf/open/floor/iron,
/area/station/cargo/miningoffice)
"kRf" = (
/obj/structure/railing{
dir = 6
},
/obj/effect/turf_decal/trimline/yellow/filled/end,
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 10
Expand All @@ -29953,6 +29953,11 @@
pixel_y = 4
},
/obj/structure/cable,
/obj/structure/railing{
dir = 4;
layer = 4.1
},
/obj/structure/railing,
/turf/open/floor/iron,
/area/station/engineering/atmos)
"kRi" = (
Expand Down Expand Up @@ -41864,8 +41869,10 @@
/area/station/hallway/secondary/entry)
"pdU" = (
/obj/structure/railing{
dir = 6
dir = 4;
layer = 4.1
},
/obj/structure/railing,
/turf/open/floor/plating/airless,
/area/space/nearstation)
"pdX" = (
Expand Down Expand Up @@ -60993,8 +61000,10 @@
/obj/structure/railing{
dir = 4
},
/obj/structure/railing,
/obj/structure/railing{
dir = 10
dir = 8;
layer = 4.1
},
/turf/open/floor/iron/dark/textured,
/area/station/engineering/atmos)
Expand Down
76 changes: 13 additions & 63 deletions _maps/map_files/Mining/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -560,10 +560,11 @@
/turf/open/floor/plating,
/area/mine/maintenance/production)
"dw" = (
/obj/effect/turf_decal/sand/plating/volcanic,
/obj/structure/railing{
dir = 10
dir = 8
},
/obj/effect/turf_decal/sand/plating/volcanic,
/obj/structure/railing,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"dx" = (
Expand Down Expand Up @@ -745,13 +746,6 @@
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/mine/laborcamp/security/maintenance)
"fb" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/structure/lattice/catwalk/mining,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"fe" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -3215,13 +3209,6 @@
"rF" = (
/turf/closed/wall/r_wall,
/area/mine/maintenance/labor)
"rG" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"rH" = (
/obj/machinery/mineral/processing_unit{
dir = 1;
Expand Down Expand Up @@ -3762,13 +3749,6 @@
/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
/turf/open/floor/plating,
/area/mine/maintenance/service)
"vd" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"ve" = (
/obj/structure/cable,
/obj/machinery/power/terminal{
Expand Down Expand Up @@ -4106,13 +4086,6 @@
dir = 1
},
/area/mine/mechbay)
"xh" = (
/obj/structure/railing/corner{
dir = 8
},
/obj/effect/turf_decal/sand/plating/volcanic,
/turf/open/floor/plating/lavaland_atmos,
/area/lavaland/surface/outdoors)
"xi" = (
/obj/structure/table,
/obj/item/paper,
Expand Down Expand Up @@ -4713,12 +4686,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/smooth_edge,
/area/mine/laborcamp/production)
"AQ" = (
/obj/structure/railing/corner{
dir = 8
},
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"AV" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/reagent_containers/cup/glass/bottle/beer,
Expand All @@ -4739,10 +4706,6 @@
},
/turf/open/floor/iron/dark,
/area/mine/production)
"Bd" = (
/obj/structure/railing/corner,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"By" = (
/obj/machinery/door/poddoor/preopen{
id = "labor";
Expand Down Expand Up @@ -6581,9 +6544,6 @@
/turf/open/floor/iron/checker,
/area/mine/cafeteria)
"MQ" = (
/obj/structure/railing/corner{
dir = 4
},
/obj/structure/sign/directions/security/directional/west{
pixel_x = 32;
pixel_y = -8
Expand Down Expand Up @@ -7288,20 +7248,10 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/mine/maintenance/service)
"RB" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/structure/lattice/catwalk/mining,
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"RD" = (
/turf/closed/wall,
/area/mine/maintenance/labor)
"RF" = (
/obj/structure/railing/corner{
dir = 1
},
/obj/structure/sign/directions/security/directional/west{
pixel_x = 0;
pixel_y = 24
Expand Down Expand Up @@ -34609,7 +34559,7 @@ pU
pU
pU
pU
AQ
pU
ZM
ZM
ZM
Expand All @@ -34622,8 +34572,8 @@ ZM
ZM
ZM
Ka
vd
xh
BP
BP
dw
pU
aj
Expand Down Expand Up @@ -34864,7 +34814,7 @@ pU
pU
pU
pU
Bd
pU
VK
VK
VK
Expand Down Expand Up @@ -35137,7 +35087,7 @@ aj
aj
aj
FH
rG
BP
ol
aj
aj
Expand Down Expand Up @@ -37451,7 +37401,7 @@ px
DI
oS
BP
xh
BP
ZM
ZM
ZM
Expand Down Expand Up @@ -37711,7 +37661,7 @@ xt
VK
VK
VK
fb
tF
BP
dx
Kf
Expand Down Expand Up @@ -44383,7 +44333,7 @@ pU
nm
Nc
nm
RB
tF
Yq
aj
aj
Expand Down Expand Up @@ -47193,7 +47143,7 @@ pU
pU
pU
pU
AQ
pU
ZM
ZM
ZM
Expand Down Expand Up @@ -47450,7 +47400,7 @@ pU
pU
pU
pU
Bd
pU
VK
VK
VK
Expand Down
Loading
Loading