cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 11:17:32 -08:00
committed by GitHub
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/events/carp_migration.dm
View File

@@ -75,7 +75,7 @@
// Spawn a single carp at given location.
/datum/event/carp_migration/proc/spawn_one_carp(var/loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/carp/event(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_carp_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_carp_destruction))
spawned_carp.Add(M)
return M
@@ -89,7 +89,7 @@
// If carp is bomphed, remove it from the list.
/datum/event/carp_migration/proc/on_carp_destruction(var/mob/M)
spawned_carp -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_carp_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/carp_migration/end()
. = ..()

4
code/modules/events/gnat_migration.dm
View File

@@ -71,7 +71,7 @@
// Spawn a single gnat at given location.
/datum/event/gnat_migration/proc/spawn_one_gnat(var/loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/gnat(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_gnat_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_gnat_destruction))
spawned_gnat.Add(M)
return M
@@ -85,7 +85,7 @@
// If gnat is bomphed, remove it from the list.
/datum/event/gnat_migration/proc/on_gnat_destruction(var/mob/M)
spawned_gnat -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_gnat_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/gnat_migration/end()
. = ..()

15
code/modules/events/infestation.dm
View File

@@ -87,28 +87,28 @@
min_number = 2 //CHOMP Add
max_number = 6
vermstring = "lizards"
// ChompEDIT Begin
if(VERM_SPIDERS)
spawn_types = list(/obj/effect/spider/spiderling)
min_number = 4 //CHOMP Add
max_number = 8 //CHOMP edit
vermstring = "spiders"
/* //Chomp REMOVE - in upstream file, not used here
// Check if any landmarks exist!
for(var/obj/effect/landmark/C in landmarks_list)
if(C.name == "verminstart")
spawn_locations.Add(C.loc)
*/ //Chomp REMOVE END
spawn(0)
var/num = rand(min_number,max_number)
while(turfs.len > 0 && num > 0)
var/turf/simulated/floor/T = pick(turfs)
turfs.Remove(T)
num--
if(vermin == VERM_SPIDERS)
var/obj/effect/spider/spiderling/S = new(T)
S.amount_grown = -1
@@ -136,7 +136,7 @@
// Spawn a single vermin at given location.
/datum/event/infestation/proc/spawn_one_vermin(var/loc)
var/mob/living/simple_mob/animal/M = new spawn_types(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_vermin_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_vermin_destruction))
spawned_vermin.Add(M)
return M
@@ -150,8 +150,9 @@
// If vermin is kill, remove it from the list.
/datum/event/infestation/proc/on_vermin_destruction(var/mob/M)
spawned_vermin -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_vermin_destruction))
*/ // CHOMPedit End
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
*/
/datum/event/infestation/announce()
command_announcement.Announce("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation")

4
code/modules/events/jellyfish_migration.dm
View File

@@ -71,7 +71,7 @@
// Spawn a single jellyfish at given location.
/datum/event/jellyfish_migration/proc/spawn_one_jellyfish(var/loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_jellyfish_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_jellyfish_destruction))
spawned_jellyfish.Add(M)
return M
@@ -85,7 +85,7 @@
// If jellyfish is bomphed, remove it from the list.
/datum/event/jellyfish_migration/proc/on_jellyfish_destruction(var/mob/M)
spawned_jellyfish -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_jellyfish_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/jellyfish_migration/end()
. = ..()

4
code/modules/events/ray_migration.dm
View File

@@ -71,7 +71,7 @@
// Spawn a single ray at given location.
/datum/event/ray_migration/proc/spawn_one_ray(var/loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/ray(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_ray_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_ray_destruction))
spawned_ray.Add(M)
return M
@@ -85,7 +85,7 @@
// If ray is bomphed, remove it from the list.
/datum/event/ray_migration/proc/on_ray_destruction(var/mob/M)
spawned_ray -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_ray_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/ray_migration/end()
. = ..()

4
code/modules/events/shark_migration.dm
View File

@@ -71,7 +71,7 @@
// Spawn a single shark at given location.
/datum/event/shark_migration/proc/spawn_one_shark(var/loc)
var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/animal/space/shark/event(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_shark_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_shark_destruction))
spawned_shark.Add(M)
return M
@@ -85,7 +85,7 @@
// If shark is bomphed, remove it from the list.
/datum/event/shark_migration/proc/on_shark_destruction(var/mob/M)
spawned_shark -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_shark_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/shark_migration/end()
. = ..()

4
code/modules/events/spacefish_migration.dm
View File

@@ -94,7 +94,7 @@
// Spawn a single fish at given location.
/datum/event/spacefish_migration/proc/spawn_one_fish(var/loc)
var/mob/living/simple_mob/animal/M = new fish_type(loc)
GLOB.destroyed_event.register(M, src, PROC_REF(on_fish_destruction))
RegisterSignal(M, COMSIG_OBSERVER_DESTROYED, PROC_REF(on_fish_destruction))
spawned_fish.Add(M)
return M
@@ -108,7 +108,7 @@
// If fish is bomphed, remove it from the list.
/datum/event/spacefish_migration/proc/on_fish_destruction(var/mob/M)
spawned_fish -= M
GLOB.destroyed_event.unregister(M, src, PROC_REF(on_fish_destruction))
UnregisterSignal(M, COMSIG_OBSERVER_DESTROYED)
/datum/event/spacefish_migration/end()
. = ..()