shiptest-ss13 · thgvr · Aug 27, 2024 · Jun 4, 2024 · Jun 4, 2024 · Jun 18, 2024
diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm
@@ -22,16 +22,6 @@
 #define APPRENTICE_ROBELESS "robeless"
 #define APPRENTICE_HEALING "healing"
 
-
-//Blob
-/// blob gets a free reroll every X time
-#define BLOB_REROLL_TIME 2400
-#define BLOB_SPREAD_COST 4
-/// blob refunds this much if it attacks and doesn't spread
-#define BLOB_ATTACK_REFUND 2
-#define BLOB_REFLECTOR_COST 15
-
-
 //ERT Types
 #define ERT_BLUE "Blue"
 #define ERT_RED "Red"

diff --git a/code/__DEFINES/dcs/signals/signals.dm b/code/__DEFINES/dcs/signals/signals.dm
@@ -121,8 +121,6 @@
 #define COMSIG_ATOM_CHECKPARTS "atom_checkparts"
 ///from base of atom/CheckParts(): (atom/movable/new_craft) - The atom has just been used in a crafting recipe and has been moved inside new_craft.
 #define COMSIG_ATOM_USED_IN_CRAFT "atom_used_in_craft"
-///from base of atom/blob_act(): (/obj/structure/blob)
-#define COMSIG_ATOM_BLOB_ACT "atom_blob_act"
 ///from base of atom/acid_act(): (acidpwr, acid_volume)
 #define COMSIG_ATOM_ACID_ACT "atom_acid_act"
 ///from base of atom/emag_act(): (/mob/user)

diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
@@ -83,8 +83,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 ////////////////Area flags\\\\\\\\\\\\\\
 /// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn
 #define VALID_TERRITORY (1<<0)
-/// If blobs can spawn there and if it counts towards their score.
-#define BLOBS_ALLOWED (1<<1)
 /// If mining tunnel generation is allowed in this area
 #define CAVES_ALLOWED (1<<2)
 /// If flora are allowed to spawn in this area randomly through tunnel generation
@@ -108,7 +106,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define PASSTABLE (1<<0)
 #define PASSGLASS (1<<1)
 #define PASSGRILLE (1<<2)
-#define PASSBLOB (1<<3)
 #define PASSMOB (1<<4)
 #define PASSCLOSEDTURF (1<<5)
 /// Let thrown things past us. **ONLY MEANINGFUL ON pass_flags_self!**

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -155,8 +155,6 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 
 #define isnewplayer(A) (istype(A, /mob/dead/new_player))
 
-#define isovermind(A) (istype(A, /mob/camera/blob))
-
 #define iscameramob(A) (istype(A, /mob/camera))
 
 #define isaicamera(A) (istype(A, /mob/camera/aiEye))
@@ -227,8 +225,6 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 
 #define iseffect(O) (istype(O, /obj/effect))
 
-#define isblobmonster(O) (istype(O, /mob/living/simple_animal/hostile/blob))
-
 #define isshuttleturf(T) (length(T.baseturfs) && (/turf/baseturf_skipover/shuttle in T.baseturfs))
 
 #define isProbablyWallMounted(O) (O.pixel_x > 20 || O.pixel_x < -20 || O.pixel_y > 20 || O.pixel_y < -20)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
@@ -277,9 +277,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define NUKE_SYNDICATE_BASE 3
 #define STATION_DESTROYED_NUKE 4
 #define STATION_EVACUATED 5
-#define BLOB_WIN 8
-#define BLOB_NUKE 9
-#define BLOB_DESTROYED 10
 #define CULT_ESCAPE 11
 #define CULT_FAILURE 12
 #define CULT_SUMMON 13

diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
@@ -18,7 +18,6 @@
 #define ROLE_ALIEN "Xenomorph"
 #define ROLE_PAI "pAI"
 #define ROLE_CULTIST "Cultist"
-#define ROLE_BLOB "Blob"
 #define ROLE_NINJA "Space Ninja"
 #define ROLE_MONKEY "Monkey"
 #define ROLE_ABDUCTOR "Abductor"
@@ -54,7 +53,6 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_ALIEN,
 	ROLE_PAI,
 	ROLE_CULTIST = /datum/game_mode/cult,
-	ROLE_BLOB,
 	ROLE_NINJA,
 	ROLE_OBSESSED,
 	ROLE_SPACE_DRAGON,

diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
@@ -77,18 +77,13 @@
 				var/pos = length(file_data["[escape_status]"]) + 1
 				file_data["[escape_status]"]["[pos]"] = mob_data
 
-	var/datum/station_state/end_state = new /datum/station_state()
-	end_state.count()
-	var/station_integrity = min(PERCENT(GLOB.start_state.score(end_state)), 100)
-	file_data["additional data"]["station integrity"] = station_integrity
 	WRITE_FILE(json_file, json_encode(file_data))
 
 	SSblackbox.record_feedback("nested tally", "round_end_stats", num_survivors, list("survivors", "total"))
 	SSblackbox.record_feedback("nested tally", "round_end_stats", GLOB.joined_player_list.len, list("players", "total"))
 	SSblackbox.record_feedback("nested tally", "round_end_stats", GLOB.joined_player_list.len - num_survivors, list("players", "dead"))
 	. = list()
 	.[POPCOUNT_SURVIVORS] = num_survivors
-	.["station_integrity"] = station_integrity
 
 /datum/controller/subsystem/ticker/proc/gather_antag_data()
 	var/team_gid = 1

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -50,7 +50,6 @@ DEFINE_BITFIELD(appearance_flags, list(
 
 DEFINE_BITFIELD(area_flags, list(
 	"VALID_TERRITORY" = VALID_TERRITORY,
-	"BLOBS_ALLOWED" = BLOBS_ALLOWED,
 	"CAVES_ALLOWED" = CAVES_ALLOWED,
 	"FLORA_ALLOWED" = FLORA_ALLOWED,
 	"MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
@@ -213,7 +212,6 @@ DEFINE_BITFIELD(obj_flags, list(
 
 DEFINE_BITFIELD(pass_flags, list(
 	"LETPASSTHROW" = LETPASSTHROW,
-	"PASSBLOB" = PASSBLOB,
 	"PASSCLOSEDTURF" = PASSCLOSEDTURF,
 	"PASSGLASS" = PASSGLASS,
 	"PASSGRILLE" = PASSGRILLE,

diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm
@@ -5,7 +5,6 @@ GLOBAL_VAR(survivor_report) //Contains shared survivor report for roundend repor
 
 
 GLOBAL_VAR_INIT(wavesecret, 0) // meteor mode, delays wave progression, terrible name
-GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report
 
 //TODO clear this one up too
 GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)

diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm
@@ -30,7 +30,6 @@ GLOBAL_LIST_EMPTY(tdome2)
 GLOBAL_LIST_EMPTY(tdomeobserve)
 GLOBAL_LIST_EMPTY(tdomeadmin)
 GLOBAL_LIST_EMPTY(prisonwarped)	//list of players already warped
-GLOBAL_LIST_EMPTY(blobstart) //blobs, santa, respawning devils
 GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players
 GLOBAL_LIST_EMPTY(deathsquadspawn)
 GLOBAL_LIST_EMPTY(emergencyresponseteamspawn)

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -420,14 +420,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	icon_state = "alien_noqueen"
 	alerttooltipstyle = "alien"
 
-//BLOBS
-
-/atom/movable/screen/alert/nofactory
-	name = "No Factory"
-	desc = "You have no factory, and are slowly dying!"
-	icon_state = "blobbernaut_nofactory"
-	alerttooltipstyle = "blob"
-
 // BLOODCULT
 
 /atom/movable/screen/alert/bloodsense

diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
diff --git a/code/_onclick/hud/blobbernauthud.dm b/code/_onclick/hud/blobbernauthud.dm
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -29,8 +29,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	var/atom/movable/screen/ling/chems/lingchemdisplay
 	var/atom/movable/screen/ling/sting/lingstingdisplay
 
-	var/atom/movable/screen/blobpwrdisplay
-
 	var/atom/movable/screen/alien_plasma_display
 	var/atom/movable/screen/alien_queen_finder
 
@@ -113,7 +111,6 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	lingchemdisplay = null
 	devilsouldisplay = null
 	lingstingdisplay = null
-	blobpwrdisplay = null
 	alien_plasma_display = null
 	alien_queen_finder = null
 	combo_display = null

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
@@ -597,22 +597,6 @@
 	icon = 'icons/hud/screen_cyborg.dmi'
 	screen_loc = ui_borg_health
 
-/atom/movable/screen/healths/blob
-	name = "blob health"
-	icon_state = "block"
-	screen_loc = ui_internal
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
-/atom/movable/screen/healths/blob/naut
-	name = "health"
-	icon = 'icons/mob/blob.dmi'
-	icon_state = "nauthealth"
-
-/atom/movable/screen/healths/blob/naut/core
-	name = "overmind health"
-	icon_state = "corehealth"
-	screen_loc = ui_health
-
 /atom/movable/screen/healths/guardian
 	name = "summoner health"
 	icon = 'icons/mob/guardian.dmi'