Skip to content

Commit

Permalink
Deletes all of assault ops, yippie! (#273)
Browse files Browse the repository at this point in the history
* get real

* some bugfixes

* deletes the ship

* deletes the base from the centcom zlevel, too

* removes base alarms from the nri ship
  • Loading branch information
Paxilmaniac authored and FFMirrorBot committed Jan 6, 2024
1 parent bd0f3ed commit ccf63f7
Show file tree
Hide file tree
Showing 49 changed files with 1,824 additions and 5,970 deletions.
4,463 changes: 1,823 additions & 2,640 deletions _maps/map_files/generic/CentCom_nova_z2.dmm

Large diffs are not rendered by default.

1,329 changes: 0 additions & 1,329 deletions _maps/shuttles/nova/goldeneye_cruiser.dmm

This file was deleted.

15 changes: 0 additions & 15 deletions _maps/shuttles/nova/pirate_nri_raider.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,6 @@
/turf/open/floor/plating,
/area/shuttle/pirate/nri)
"qp" = (
/obj/machinery/base_alarm/nri_raider{
pixel_x = 32
},
/turf/open/floor/pod/light,
/area/shuttle/pirate/nri)
"qz" = (
Expand Down Expand Up @@ -606,9 +603,6 @@
/turf/open/floor/pod/light,
/area/shuttle/pirate/nri)
"wh" = (
/obj/machinery/base_alarm/nri_raider{
pixel_x = 32
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -724,9 +718,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/base_alarm/nri_raider{
pixel_y = 32
},
/obj/item/storage/medkit/surgery,
/turf/open/floor/pod/dark,
/area/shuttle/pirate/nri)
Expand Down Expand Up @@ -814,9 +805,6 @@
/turf/open/floor/plating/airless,
/area/shuttle/pirate/nri)
"CP" = (
/obj/machinery/base_alarm/nri_raider{
pixel_x = -32
},
/obj/machinery/newscaster/directional/north,
/obj/structure/frame/computer,
/obj/item/circuitboard/computer/advanced_camera,
Expand Down Expand Up @@ -1275,9 +1263,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/base_alarm/nri_raider{
pixel_y = 32
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate/nri)
"UO" = (
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@
#define ANNOUNCER_ERTYES "announcer_ertyes"
#define ANNOUNCER_MUTANTS "announcer_mutants"
#define ANNOUNCER_KLAXON "announcer_klaxon"
#define ANNOUNCER_ICARUS "announcer_icarus"
#define ANNOUNCER_NRI_RAIDERS "announcer_nri_raiders"
#define ANNOUNCER_OUTBREAK6 "announcer_outbreak6"
#define ANNOUNCER_DEPARTMENTAL "announcer_departmental"
Expand Down Expand Up @@ -195,7 +194,6 @@ GLOBAL_LIST_INIT(announcer_keys, list(
ANNOUNCER_ERTYES,
ANNOUNCER_MUTANTS,
ANNOUNCER_KLAXON,
ANNOUNCER_ICARUS,
ANNOUNCER_NRI_RAIDERS,
ANNOUNCER_OUTBREAK6,
//NOVA EDIT END
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/structures/morgue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,6 @@ GLOBAL_LIST_EMPTY(crematoriums)
qdel(M)

for(var/obj/O in conts) //conts defined above, ignores crematorium and tray
// NOVA EDIT ADDITION
if(istype(O, /obj/item/goldeneye_key))
continue
// NOVA EDIT END
if(istype(O, /obj/effect/dummy/phased_mob)) //they're not physical, don't burn em.
continue
qdel(O)
Expand Down
1 change: 0 additions & 1 deletion code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/spawn_liquid, /*NOVA EDIT ADDITION*/
/client/proc/spawn_mob_spawner, /*NOVA EDIT ADDITION*/
/client/proc/spawn_pollution, /*NOVA EDIT ADDITION*/
/client/proc/spawn_sunbeam, /*NOVA EDIT ADDITION*/
/client/proc/intensity_credits_panel, /*NOVA EDIT ADDITION*/
/client/proc/toggle_bsa, /*NOVA EDIT ADDITION*/
/client/proc/try_stop_delam, /*NOVA EDIT ADDITION*/
Expand Down
4 changes: 0 additions & 4 deletions code/modules/antagonists/nukeop/equipment/pinpointer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@
target = apc
if(TRACK_INFILTRATOR)
target = SSshuttle.getShuttle("syndicate")
// NOVA EDIT ADDITION
if(TRACK_GOLDENEYE)
target = SSgoldeneye.goldeneye_keys[1] // Track the first goldeneye key in existence.
// NOVA EDIT END
..()

/obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode)
Expand Down
1 change: 0 additions & 1 deletion modular_nova/modules/alerts/code/default_announcer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
ANNOUNCER_ERTYES = 'modular_nova/modules/alerts/sound/alerts/yesert.ogg',
ANNOUNCER_MUTANTS = 'modular_nova/modules/alerts/sound/alerts/hazdet.ogg',
ANNOUNCER_KLAXON = 'modular_nova/modules/black_mesa/sound/siren1_long.ogg',
ANNOUNCER_ICARUS = 'modular_nova/modules/assault_operatives/sound/icarus_alarm.ogg',
ANNOUNCER_NRI_RAIDERS = 'modular_nova/modules/encounters/sounds/morse.ogg',
ANNOUNCER_DEPARTMENTAL = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',
ANNOUNCER_SHUTTLE = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg',
Expand Down
64 changes: 0 additions & 64 deletions modular_nova/modules/assault_operatives/code/areas.dm

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit ccf63f7

Please sign in to comment.