mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 23:27:34 +01:00
More Initialize() fixes, requires someone to test with DB (#30831)
* Batch 1 /obj/item/storage/firstaid/fire /obj/structure/bookcase /obj/item/book/random QDEL, not actually in the logs but returned wrong hint /obj/effect/landmark/start/wizard QDEL /obj/effect/landmark/start/wizard /obj/effect/landmark/start/new_player /obj/effect/landmark/latejoin /obj/effect/landmark/xeno_spawn /obj/effect/landmark/blobstart /obj/effect/landmark/secequipment /obj/effect/landmark/prisonwarp /obj/effect/landmark/ert_spawn /obj/effect/landmark/holding_facility /obj/effect/landmark/thunderdome/observe /obj/effect/landmark/thunderdome/one /obj/effect/landmark/thunderdome/two /obj/effect/landmark/thunderdome/admin * Batch 2 /obj/machinery/computer/operating /obj/machinery/computer/telecrystals/uplinker /obj/item/card/id/centcom /obj/item/card/id/syndicate /obj/item/card/id/captains_spare /obj/item/card/id/ert /obj/item/card/id/ert/Security /obj/item/card/id/ert/Engineer /obj/item/card/id/ert/Medical /obj/structure/trap /obj/machinery/magnetic_controller /obj/item/storage/toolbox /obj/structure/table * Batch 3 /obj/machinery/vending/snack/random /obj/machinery/vending/cola/random /obj/machinery/computer/pod /obj/machinery/computer/message_monitor /obj/machinery/computer/atmos_control /obj/item/implanter /obj/item/implantcase /obj/item/construction /turf/open/floor/grass /turf/open/floor/grass/snow/basalt /turf/open/floor/grass/fakebasalt /turf/open/floor/carpet /turf/open/floor/fakespace /turf/open/floor/light /turf/open/floor/mineral /turf/open/floor/mineral/abductor /turf/open/floor/circuit /turf/open/floor/clockwork /turf/open/floor/plating /turf/open/floor/engine/cult * Batch 4 /obj/item/storage/backpack/satchel/flat /obj/item/storage/backpack/satchel/flat/secret /turf/closed/indestructible/fakeglass /turf/closed/mineral/random /turf/closed/mineral/gibtonite /turf/closed/mineral /turf/open/floor /obj/effect/spawner/lootdrop * Batch 5 /obj/effect/spawner/lootdrop/maintenance /obj/effect/spawner/lootdrop/costume /obj/item/toy/eightball/broken /obj/item/toy/eightball /obj/item/toy/eightball/haunted /obj/item/device/electropack /obj/item/restraints/legcuffs/beartrap /obj/machinery/airlock_sensor /obj/item/storage/box/ingredients * Batch 6 /mob/living/simple_animal/hostile/carp/ranged /obj/structure/lattice/clockwork /obj/structure/lattice/clockwork/large /obj/structure/lattice/catwalk/clockwork /mob/living/simple_animal/hostile/mushroom /mob/living/carbon/alien /mob/living/carbon/alien/larva /mob/living/carbon/alien/humanoid /mob/living/carbon/alien/humanoid/drone /mob/living/carbon/alien/humanoid/royal/praetorian /mob/living/carbon/alien/humanoid/sentinel
This commit is contained in:
committed by
Jordan Brown
parent
66a8bfb304
commit
772924ba38
@@ -88,7 +88,7 @@
|
||||
..()
|
||||
if(FESTIVE_SEASON in SSevents.holidays)
|
||||
new tree(get_turf(src))
|
||||
qdel(src)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/effect/landmark/xmastree/rdrod
|
||||
name = "festivus pole spawner"
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/carp/ranged/Initialize()
|
||||
projectiletype = pick(allowed_projectile_types)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/simple_animal/hostile/carp/ranged/chaos
|
||||
name = "chaos magicarp"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
|
||||
/obj/structure/bookcase/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
if(!mapload)
|
||||
return
|
||||
state = 2
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
/obj/item/book/manual/random/Initialize()
|
||||
. = ..()
|
||||
..()
|
||||
var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
|
||||
var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books)
|
||||
new newtype(loc)
|
||||
qdel(src)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/book/random
|
||||
var/amount = 1
|
||||
var/category = null
|
||||
|
||||
/obj/item/book/random/Initialize()
|
||||
. = ..()
|
||||
..()
|
||||
create_random_books(amount, src.loc, TRUE, category)
|
||||
qdel(src)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/book/random/triple
|
||||
amount = 3
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
create_internal_organs()
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/alien/create_internal_organs()
|
||||
internal_organs += new /obj/item/organ/brain/alien
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
/mob/living/carbon/alien/humanoid/drone/Initialize()
|
||||
AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
/mob/living/carbon/alien/humanoid/drone/create_internal_organs()
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
|
||||
AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve())
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/alien/humanoid/royal/praetorian/create_internal_organs()
|
||||
internal_organs += new /obj/item/organ/alien/plasmavessel/large
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
/mob/living/carbon/alien/humanoid/sentinel/Initialize()
|
||||
AddAbility(new /obj/effect/proc_holder/alien/sneak)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/alien/humanoid/sentinel/create_internal_organs()
|
||||
internal_organs += new /obj/item/organ/alien/plasmavessel
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
//This is fine right now, if we're adding organ specific damage this needs to be updated
|
||||
/mob/living/carbon/alien/humanoid/Initialize()
|
||||
AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/alien/humanoid/movement_delay()
|
||||
. = ..()
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
AddAbility(new/obj/effect/proc_holder/alien/hide(null))
|
||||
AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/carbon/alien/larva/create_internal_organs()
|
||||
internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
cap_color = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
|
||||
UpdateMushroomCap()
|
||||
health = maxHealth
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting
|
||||
if(!retreat_distance && prob(33))
|
||||
|
||||
Reference in New Issue
Block a user