Skip to content

Commit

Permalink
Make Gamemodes Whole Again (#224)
Browse files Browse the repository at this point in the history
* patchwork gamemodes back together

* Order of operations. Can't give tot before a job.

* fix stuff

* formatting

* whoops

* add extended

* Lots o gamemodes

* add mixed

* Probably working revolution + bug fixes

* hahahahhahahaha oops

* gamemodes that need players, need players

* fix some bugs

* fallback extended, fix mixed

* fix pickweight

* log gam e

* fix bugs

* hard del maker 9000

* fixes

* guh

* fix dynamic stuff even though its disabled lol

* get ready for midrounds

* KILL

* remove ghost roles

* run map merge

* remove midround injector

* tweaks

* tweaks

* message

* fix BB scaling

* PROC REF

* reduce copy paste w/ antag datums

* revs

* more cleanup, add wizard gamemode

* add nuclear emergency

* fuck

* fix fail execution

* for real this time

* fix GAMEMODE_WAS macros

* cleanup antag selection/distribution code
  • Loading branch information
Kapu1178 authored Apr 19, 2024
1 parent 326a445 commit d062148
Show file tree
Hide file tree
Showing 129 changed files with 1,115 additions and 6,903 deletions.
13 changes: 2 additions & 11 deletions _maps/RandomRuins/SpaceRuins/TheDerelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -940,10 +940,6 @@
},
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"fw" = (
/obj/effect/mob_spawn/ghost_role/drone/derelict,
/turf/open/floor/iron/airless,
/area/ruin/space/derelict/bridge/access)
"fx" = (
/turf/open/floor/iron/airless,
/area/ruin/space/derelict/bridge/access)
Expand Down Expand Up @@ -1433,10 +1429,6 @@
/obj/item/storage/box/lights/mixed,
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"in" = (
/obj/effect/mob_spawn/ghost_role/drone/derelict,
/turf/open/floor/plating/airless,
/area/ruin/space/derelict/singularity_engine)
"ip" = (
/obj/item/stack/cable_coil/cut,
/obj/effect/mapping_helpers/broken_floor,
Expand Down Expand Up @@ -2516,7 +2508,6 @@
dir = 1
},
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/mob_spawn/ghost_role/drone/derelict,
/turf/open/floor/iron/airless,
/area/ruin/space/derelict/se_solar)
"nV" = (
Expand Down Expand Up @@ -7552,7 +7543,7 @@ ez
ez
ez
dW
in
dW
dr
iP
ay
Expand Down Expand Up @@ -9458,7 +9449,7 @@ aa
aa
GI
cs
fw
fx
fx
fx
fR
Expand Down
45 changes: 4 additions & 41 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4068,18 +4068,6 @@
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/ancientstation/delta/rnd)
"kr" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldsec,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/charlie/dorms)
"ks" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
Expand Down Expand Up @@ -4234,18 +4222,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/charlie/dorms)
"kO" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldsci,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/charlie/dorms)
"kP" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
Expand Down Expand Up @@ -4411,18 +4387,6 @@
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/ancientstation/delta/ai)
"ln" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldeng,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/charlie/dorms)
"lo" = (
/turf/closed/mineral/silver,
/area/ruin/unpowered)
Expand All @@ -4444,7 +4408,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/oldsci,
/turf/open/floor/iron,
/area/ruin/space/has_grav/ancientstation/charlie/dorms)
"ls" = (
Expand Down Expand Up @@ -9345,9 +9308,9 @@ jJ
cq
jS
bN
ln
lr
bN
kO
lr
bN
lr
pm
Expand Down Expand Up @@ -9541,9 +9504,9 @@ jJ
FV
jT
Fv
kr
lr
bN
ln
lr
bN
kp
pk
Expand Down
15 changes: 2 additions & 13 deletions _maps/shuttles/hunter_bounty.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"p" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/hook,
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"q" = (
/obj/structure/shuttle/engine/heater{
dir = 8
Expand Down Expand Up @@ -211,9 +207,6 @@
/turf/open/floor/plating,
/area/shuttle/hunter)
"M" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/armor{
dir = 1
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"P" = (
Expand All @@ -222,10 +215,6 @@
},
/turf/open/floor/pod/light,
/area/shuttle/hunter)
"Z" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/bounty/synth,
/turf/open/floor/pod/light,
/area/shuttle/hunter)

(1,1,1) = {"
a
Expand Down Expand Up @@ -427,7 +416,7 @@ a
a
a
i
p
M
s
s
s
Expand All @@ -442,7 +431,7 @@ a
a
a
i
Z
M
z
s
z
Expand Down
10 changes: 0 additions & 10 deletions _maps/shuttles/hunter_russian.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@
/turf/open/floor/plating/airless,
/area/shuttle/hunter/russian)
"eQ" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/russian{
dir = 1
},
/obj/effect/turf_decal/bot_red,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/pod/dark,
Expand Down Expand Up @@ -266,7 +263,6 @@
/obj/effect/turf_decal/bot_red,
/obj/effect/turf_decal/siding/red,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mob_spawn/ghost_role/human/fugitive/russian/leader,
/turf/open/floor/pod/dark,
/area/shuttle/hunter/russian)
"xd" = (
Expand Down Expand Up @@ -300,9 +296,6 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/hunter/russian)
"yr" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/russian{
dir = 1
},
/obj/effect/turf_decal/bot_red,
/obj/machinery/light/small/directional/south,
/turf/open/floor/pod/dark,
Expand Down Expand Up @@ -615,9 +608,6 @@
/turf/open/floor/pod/dark,
/area/shuttle/hunter/russian)
"Th" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/russian{
dir = 1
},
/obj/effect/turf_decal/bot_red,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/kss13{
Expand Down
6 changes: 0 additions & 6 deletions _maps/shuttles/hunter_space_cop.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/mob_spawn/ghost_role/human/fugitive/spacepol{
dir = 1
},
/obj/effect/turf_decal/box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
Expand Down Expand Up @@ -115,9 +112,6 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
"Am" = (
/obj/effect/mob_spawn/ghost_role/human/fugitive/spacepol{
dir = 8
},
/obj/effect/turf_decal/box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/hunter)
Expand Down
Loading

0 comments on commit d062148

Please sign in to comment.