Removes Nanomob (ParadiseSS13#25417)

* Nukes nanomob * Forgot this * Update code/modules/client/preference/loadout/loadout_general.dm Co-authored-by: GDN <[email protected]> Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: GDN <[email protected]>
ItsMarmite · May 14, 2024 · 69f20e2 · 69f20e2
1 parent f105159
commit 69f20e2
Show file tree

Hide file tree

Showing 28 changed files with 71 additions and 1,962 deletions.
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -11923,7 +11923,6 @@
 /area/station/hallway/secondary/entry/north)
 "aMC" = (
 /obj/structure/table,
-/obj/machinery/computer/mob_healer_terminal,
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "aMD" = (
@@ -14876,9 +14875,6 @@
 /area/station/medical/reception)
 "aVy" = (
 /obj/machinery/economy/vending/coffee,
-/obj/machinery/computer/mob_healer_terminal{
-	pixel_x = 28
-	},
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
@@ -55778,13 +55774,6 @@
 	icon_state = "darkgreen"
 	},
 /area/station/medical/medbay3)
-"fes" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/computer/mob_battle_terminal/red,
-/turf/simulated/floor/plasteel,
-/area/station/public/dorms)
 "feN" = (
 /turf/simulated/floor/plasteel,
 /area/station/hallway/secondary/entry/north)
@@ -65342,12 +65331,6 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/station/supply/lobby)
-"jPN" = (
-/obj/machinery/computer/mob_battle_terminal/blue{
-	pixel_x = -32
-	},
-/turf/simulated/floor/plasteel,
-/area/station/public/dorms)
 "jPZ" = (
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_x = 32
@@ -76992,10 +76975,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/security/permabrig)
-"pwU" = (
-/obj/effect/landmark/battle_mob_point,
-/turf/simulated/floor/engine,
-/area/holodeck/alphadeck)
 "pxv" = (
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 8;
@@ -132341,7 +132320,7 @@ nXr
 aKQ
 fRL
 aPm
-jPN
+aPm
 lkw
 fho
 aPm
@@ -132590,7 +132569,7 @@ awE
 ayf
 azn
 arR
-fes
+tbC
 tbC
 tbC
 aPm
@@ -133621,10 +133600,10 @@ atG
 sHt
 sHt
 sHt
-pwU
 sHt
 sHt
-pwU
+sHt
+sHt
 sHt
 sHt
 sHt

diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
@@ -82602,12 +82602,6 @@
 	icon_state = "whitegreen"
 	},
 /area/station/medical/virology)
-"tpw" = (
-/obj/effect/landmark/battle_mob_point,
-/turf/simulated/floor/engine{
-	name = "Holodeck Projector Floor"
-	},
-/area/holodeck/alphadeck)
 "tpA" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -116641,10 +116635,10 @@ bEM
 pDn
 pDn
 pDn
-tpw
 pDn
 pDn
-tpw
+pDn
+pDn
 pDn
 pDn
 pDn

diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
@@ -806,9 +806,6 @@
 /turf/simulated/wall,
 /area/station/public/arcade)
 "ajb" = (
-/obj/machinery/computer/mob_battle_terminal/red{
-	pixel_y = 30
-	},
 /obj/item/kirbyplants/plant20,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
@@ -3389,9 +3386,6 @@
 	name = "east bump";
 	pixel_x = 27
 	},
-/obj/machinery/computer/mob_battle_terminal/blue{
-	pixel_y = -30
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
 	},
@@ -53400,9 +53394,6 @@
 /obj/structure/table,
 /obj/item/stack/medical/bruise_pack,
 /obj/item/stack/medical/ointment,
-/obj/machinery/computer/mob_healer_terminal{
-	pixel_y = 30
-	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whiteblue"

diff --git a/code/__DEFINES/nanomob_defines.dm b/code/__DEFINES/nanomob_defines.dm
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -91,7 +91,6 @@
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
 
 #define FIRE_PRIORITY_PING			10
-#define FIRE_PRIORITY_NANOMOB		10
 #define FIRE_PRIORITY_NIGHTSHIFT	10
 #define FIRE_PRIORITY_IDLE_NPC		10
 #define FIRE_PRIORITY_CLEANUP		10

diff --git a/code/controllers/subsystem/SSnano_mob_hunter.dm b/code/controllers/subsystem/SSnano_mob_hunter.dm
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
@@ -300,20 +300,7 @@
 			emagged = FALSE
 			setMenuState(ui.user, COMM_SCREEN_MAIN)
 
-		if("RestartNanoMob")
-			if(SSmob_hunt)
-				if(SSmob_hunt.manual_reboot())
-					var/loading_msg = pick("Respawning spawns", "Reticulating splines", "Flipping hat",
-										"Capturing all of them", "Fixing minor text issues", "Being the very best",
-										"Nerfing this", "Not communicating with playerbase", "Coding a ripoff in a 2D spaceman game")
-					to_chat(ui.user, "<span class='notice'>Restarting Nano-Mob Hunter GO! game server. [loading_msg]...</span>")
-				else
-					to_chat(ui.user, "<span class='warning'>Nano-Mob Hunter GO! game server reboot failed due to recent restart. Please wait before re-attempting.</span>")
-			else
-				to_chat(ui.user, "<span class='danger'>Nano-Mob Hunter GO! game server is offline for extended maintenance. Contact your Central Command administrators for more info if desired.</span>")
-
 		// ADMIN CENTCOMM ONLY STUFF
-
 		if("send_to_cc_announcement_page")
 			if(!ADMIN_CHECK(ui.user))
 				return

diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
@@ -1301,7 +1301,6 @@
 	icon_panel = "wide_vendor"
 	category = VENDOR_TYPE_SUPPLIES
 	products = list(/obj/item/pda =10,
-					/obj/item/cartridge/mob_hunt_game = 25,
 					/obj/item/cartridge/medical = 10,
 					/obj/item/cartridge/chemistry = 10,
 					/obj/item/cartridge/engineering = 10,
@@ -1314,7 +1313,6 @@
 					/obj/item/cartridge/mime = 1)
 
 	prices = list(/obj/item/pda = 300,
-				/obj/item/cartridge/mob_hunt_game = 50,
 				/obj/item/cartridge/medical = 200,
 				/obj/item/cartridge/chemistry = 150,
 				/obj/item/cartridge/engineering = 100,

diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
@@ -678,8 +678,5 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
 	var/turf/simulated/T = get_turf(src)
 	T.burn_tile()
 
-/obj/effect/landmark/battle_mob_point
-	name = "Nanomob Battle Avatar Spawn Point"
-
 /obj/effect/landmark/free_golem_spawn
 	name = "Free Golem Spawn Point"