mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 06:57:42 +01:00
Init Sanity Unit Test (#25442)
* Init Sanity Unit Test * Oops * Update code/modules/unit_tests/init_sanity.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Makes noticeboard less silly --------- Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
AffectedArc07
co-authored by
Contrabang
DGamerL
Contrabang
DGamerL
parent
23ad8a48fa
commit
03cca11f95
@@ -253,8 +253,8 @@
|
||||
blocks_emissive = FALSE
|
||||
|
||||
/obj/item/flashlight/flare/glowstick/Initialize()
|
||||
. = ..()
|
||||
light_color = color
|
||||
..()
|
||||
|
||||
/obj/item/flashlight/flare/glowstick/update_icon_state()
|
||||
if(!fuel)
|
||||
|
||||
@@ -26,8 +26,8 @@
|
||||
..()
|
||||
internal_channels.Cut()
|
||||
|
||||
/obj/item/radio/headset/Initialize()
|
||||
..()
|
||||
/obj/item/radio/headset/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
if(ks1type)
|
||||
keyslot1 = new ks1type(src)
|
||||
|
||||
@@ -109,8 +109,8 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
|
||||
follow_target = null
|
||||
return ..()
|
||||
|
||||
/obj/item/radio/Initialize()
|
||||
..()
|
||||
/obj/item/radio/Initialize(mapload)
|
||||
. = ..()
|
||||
if(frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
|
||||
frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
|
||||
set_frequency(frequency)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
var/progress_flash_divisor = 10 //Length of time between each "eye flash"
|
||||
|
||||
/obj/item/weldingtool/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
create_reagents(maximum_fuel)
|
||||
reagents.add_reagent("fuel", maximum_fuel)
|
||||
update_icon()
|
||||
@@ -149,7 +149,7 @@
|
||||
/obj/item/weldingtool/attack(mob/living/carbon/M, mob/living/carbon/user)
|
||||
// For lighting other people's cigarettes.
|
||||
var/obj/item/clothing/mask/cigarette/cig = M?.wear_mask
|
||||
if(!istype(cig) || user.zone_selected != "mouth" || !tool_enabled)
|
||||
if(!istype(cig) || user.zone_selected != "mouth" || !tool_enabled)
|
||||
return ..()
|
||||
|
||||
if(M == user)
|
||||
|
||||
@@ -20,8 +20,13 @@
|
||||
var/value = 0
|
||||
var/forcedmutation = FALSE //Will it give the mutation, guaranteed?
|
||||
|
||||
/obj/item/dnainjector/Initialize()
|
||||
/obj/item/dnainjector/Initialize(mapload)
|
||||
. = ..()
|
||||
|
||||
var/init_block = GetInitBlock()
|
||||
if(init_block)
|
||||
block = init_block
|
||||
|
||||
if(datatype && block)
|
||||
buf = new
|
||||
buf.dna = new
|
||||
@@ -29,6 +34,10 @@
|
||||
buf.dna.ResetSE()
|
||||
SetValue(value)
|
||||
|
||||
// Override this with a var reference to do setup
|
||||
/obj/item/dnainjector/proc/GetInitBlock()
|
||||
return null
|
||||
|
||||
/obj/item/dnainjector/Destroy()
|
||||
QDEL_NULL(buf)
|
||||
return ..()
|
||||
@@ -157,9 +166,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/hulkmut/Initialize()
|
||||
block = GLOB.hulkblock
|
||||
..()
|
||||
/obj/item/dnainjector/hulkmut/GetInitBlock()
|
||||
return GLOB.hulkblock
|
||||
|
||||
/obj/item/dnainjector/antihulk
|
||||
name = "DNA-Injector (Anti-Hulk)"
|
||||
@@ -168,9 +176,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antihulk/Initialize()
|
||||
block = GLOB.hulkblock
|
||||
..()
|
||||
/obj/item/dnainjector/antihulk/GetInitBlock()
|
||||
return GLOB.hulkblock
|
||||
|
||||
/obj/item/dnainjector/firemut
|
||||
name = "DNA-Injector (Fire)"
|
||||
@@ -179,9 +186,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/firemut/Initialize()
|
||||
block = GLOB.fireblock
|
||||
..()
|
||||
/obj/item/dnainjector/firemut/GetInitBlock()
|
||||
return GLOB.fireblock
|
||||
|
||||
/obj/item/dnainjector/antifire
|
||||
name = "DNA-Injector (Anti-Fire)"
|
||||
@@ -190,9 +196,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antifire/Initialize()
|
||||
block = GLOB.fireblock
|
||||
..()
|
||||
/obj/item/dnainjector/antifire/GetInitBlock()
|
||||
return GLOB.fireblock
|
||||
|
||||
/obj/item/dnainjector/telemut
|
||||
name = "DNA-Injector (Tele.)"
|
||||
@@ -201,9 +206,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/telemut/Initialize()
|
||||
block = GLOB.teleblock
|
||||
..()
|
||||
/obj/item/dnainjector/telemut/GetInitBlock()
|
||||
return GLOB.teleblock
|
||||
|
||||
/obj/item/dnainjector/telemut/darkbundle
|
||||
name = "DNA injector"
|
||||
@@ -216,9 +220,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antitele/Initialize()
|
||||
block = GLOB.teleblock
|
||||
..()
|
||||
/obj/item/dnainjector/antitele/GetInitBlock()
|
||||
return GLOB.teleblock
|
||||
|
||||
/obj/item/dnainjector/nobreath
|
||||
name = "DNA-Injector (Breathless)"
|
||||
@@ -227,9 +230,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/nobreath/Initialize()
|
||||
block = GLOB.breathlessblock
|
||||
..()
|
||||
/obj/item/dnainjector/nobreath/GetInitBlock()
|
||||
return GLOB.breathlessblock
|
||||
|
||||
/obj/item/dnainjector/antinobreath
|
||||
name = "DNA-Injector (Anti-Breathless)"
|
||||
@@ -238,9 +240,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antinobreath/Initialize()
|
||||
block = GLOB.breathlessblock
|
||||
..()
|
||||
/obj/item/dnainjector/antinobreath/GetInitBlock()
|
||||
return GLOB.breathlessblock
|
||||
|
||||
/obj/item/dnainjector/remoteview
|
||||
name = "DNA-Injector (Remote View)"
|
||||
@@ -249,9 +250,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/remoteview/Initialize()
|
||||
block = GLOB.remoteviewblock
|
||||
..()
|
||||
/obj/item/dnainjector/remoteview/GetInitBlock()
|
||||
return GLOB.remoteviewblock
|
||||
|
||||
/obj/item/dnainjector/antiremoteview
|
||||
name = "DNA-Injector (Anti-Remote View)"
|
||||
@@ -260,9 +260,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiremoteview/Initialize()
|
||||
block = GLOB.remoteviewblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiremoteview/GetInitBlock()
|
||||
return GLOB.remoteviewblock
|
||||
|
||||
/obj/item/dnainjector/regenerate
|
||||
name = "DNA-Injector (Regeneration)"
|
||||
@@ -271,9 +270,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/regenerate/Initialize()
|
||||
block = GLOB.regenerateblock
|
||||
..()
|
||||
/obj/item/dnainjector/regenerate/GetInitBlock()
|
||||
return GLOB.regenerateblock
|
||||
|
||||
/obj/item/dnainjector/antiregenerate
|
||||
name = "DNA-Injector (Anti-Regeneration)"
|
||||
@@ -282,9 +280,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiregenerate/Initialize()
|
||||
block = GLOB.regenerateblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiregenerate/GetInitBlock()
|
||||
return GLOB.regenerateblock
|
||||
|
||||
/obj/item/dnainjector/morph
|
||||
name = "DNA-Injector (Morph)"
|
||||
@@ -293,9 +290,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/morph/Initialize()
|
||||
block = GLOB.morphblock
|
||||
..()
|
||||
/obj/item/dnainjector/morph/GetInitBlock()
|
||||
return GLOB.morphblock
|
||||
|
||||
/obj/item/dnainjector/antimorph
|
||||
name = "DNA-Injector (Anti-Morph)"
|
||||
@@ -304,9 +300,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antimorph/Initialize()
|
||||
block = GLOB.morphblock
|
||||
..()
|
||||
/obj/item/dnainjector/antimorph/GetInitBlock()
|
||||
return GLOB.morphblock
|
||||
|
||||
/obj/item/dnainjector/noprints
|
||||
name = "DNA-Injector (No Prints)"
|
||||
@@ -315,9 +310,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/noprints/Initialize()
|
||||
block = GLOB.noprintsblock
|
||||
..()
|
||||
/obj/item/dnainjector/noprints/GetInitBlock()
|
||||
return GLOB.noprintsblock
|
||||
|
||||
/obj/item/dnainjector/antinoprints
|
||||
name = "DNA-Injector (Anti-No Prints)"
|
||||
@@ -326,9 +320,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antinoprints/Initialize()
|
||||
block = GLOB.noprintsblock
|
||||
..()
|
||||
/obj/item/dnainjector/antinoprints/GetInitBlock()
|
||||
return GLOB.noprintsblock
|
||||
|
||||
/obj/item/dnainjector/insulation
|
||||
name = "DNA-Injector (Shock Immunity)"
|
||||
@@ -337,9 +330,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/insulation/Initialize()
|
||||
block = GLOB.shockimmunityblock
|
||||
..()
|
||||
/obj/item/dnainjector/insulation/GetInitBlock()
|
||||
return GLOB.shockimmunityblock
|
||||
|
||||
/obj/item/dnainjector/antiinsulation
|
||||
name = "DNA-Injector (Anti-Shock Immunity)"
|
||||
@@ -348,9 +340,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiinsulation/Initialize()
|
||||
block = GLOB.shockimmunityblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiinsulation/GetInitBlock()
|
||||
return GLOB.shockimmunityblock
|
||||
|
||||
/obj/item/dnainjector/midgit
|
||||
name = "DNA-Injector (Small Size)"
|
||||
@@ -359,9 +350,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/midgit/Initialize()
|
||||
block = GLOB.smallsizeblock
|
||||
..()
|
||||
/obj/item/dnainjector/midgit/GetInitBlock()
|
||||
return GLOB.smallsizeblock
|
||||
|
||||
/obj/item/dnainjector/antimidgit
|
||||
name = "DNA-Injector (Anti-Small Size)"
|
||||
@@ -370,9 +360,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antimidgit/Initialize()
|
||||
block = GLOB.smallsizeblock
|
||||
..()
|
||||
/obj/item/dnainjector/antimidgit/GetInitBlock()
|
||||
return GLOB.smallsizeblock
|
||||
|
||||
/obj/item/dnainjector/eatmut
|
||||
name = "DNA-Injector (Matter Eater)"
|
||||
@@ -381,9 +370,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/eatmut/Initialize()
|
||||
block = GLOB.eatblock
|
||||
return ..()
|
||||
/obj/item/dnainjector/eatmut/GetInitBlock()
|
||||
return GLOB.eatblock
|
||||
|
||||
/obj/item/dnainjector/antieat
|
||||
name = "DNA-Injector (Anti-Matter Eater)"
|
||||
@@ -392,9 +380,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antieat/Initialize()
|
||||
block = GLOB.eatblock
|
||||
return ..()
|
||||
/obj/item/dnainjector/antieat/GetInitBlock()
|
||||
return GLOB.eatblock
|
||||
|
||||
/////////////////////////////////////
|
||||
/obj/item/dnainjector/antiglasses
|
||||
@@ -404,9 +391,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiglasses/Initialize()
|
||||
block = GLOB.glassesblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiglasses/GetInitBlock()
|
||||
return GLOB.glassesblock
|
||||
|
||||
/obj/item/dnainjector/glassesmut
|
||||
name = "DNA-Injector (Glasses)"
|
||||
@@ -415,9 +401,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/glassesmut/Initialize()
|
||||
block = GLOB.glassesblock
|
||||
..()
|
||||
/obj/item/dnainjector/glassesmut/GetInitBlock()
|
||||
return GLOB.glassesblock
|
||||
|
||||
/obj/item/dnainjector/epimut
|
||||
name = "DNA-Injector (Epi.)"
|
||||
@@ -426,9 +411,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/epimut/Initialize()
|
||||
block = GLOB.epilepsyblock
|
||||
..()
|
||||
/obj/item/dnainjector/epimut/GetInitBlock()
|
||||
return GLOB.epilepsyblock
|
||||
|
||||
/obj/item/dnainjector/antiepi
|
||||
name = "DNA-Injector (Anti-Epi.)"
|
||||
@@ -437,9 +421,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiepi/Initialize()
|
||||
block = GLOB.epilepsyblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiepi/GetInitBlock()
|
||||
return GLOB.epilepsyblock
|
||||
|
||||
/obj/item/dnainjector/anticough
|
||||
name = "DNA-Injector (Anti-Cough)"
|
||||
@@ -448,9 +431,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/anticough/Initialize()
|
||||
block = GLOB.coughblock
|
||||
..()
|
||||
/obj/item/dnainjector/anticough/GetInitBlock()
|
||||
return GLOB.coughblock
|
||||
|
||||
/obj/item/dnainjector/coughmut
|
||||
name = "DNA-Injector (Cough)"
|
||||
@@ -459,9 +441,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/coughmut/Initialize()
|
||||
block = GLOB.coughblock
|
||||
..()
|
||||
/obj/item/dnainjector/coughmut/GetInitBlock()
|
||||
return GLOB.coughblock
|
||||
|
||||
/obj/item/dnainjector/clumsymut
|
||||
name = "DNA-Injector (Clumsy)"
|
||||
@@ -470,9 +451,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/clumsymut/Initialize()
|
||||
block = GLOB.clumsyblock
|
||||
..()
|
||||
/obj/item/dnainjector/clumsymut/GetInitBlock()
|
||||
return GLOB.clumsyblock
|
||||
|
||||
/obj/item/dnainjector/anticlumsy
|
||||
name = "DNA-Injector (Anti-Clumy)"
|
||||
@@ -481,9 +461,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/anticlumsy/Initialize()
|
||||
block = GLOB.clumsyblock
|
||||
..()
|
||||
/obj/item/dnainjector/anticlumsy/GetInitBlock()
|
||||
return GLOB.clumsyblock
|
||||
|
||||
/obj/item/dnainjector/antitour
|
||||
name = "DNA-Injector (Anti-Tour.)"
|
||||
@@ -492,9 +471,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antitour/Initialize()
|
||||
block = GLOB.twitchblock
|
||||
..()
|
||||
/obj/item/dnainjector/antitour/GetInitBlock()
|
||||
return GLOB.twitchblock
|
||||
|
||||
/obj/item/dnainjector/tourmut
|
||||
name = "DNA-Injector (Tour.)"
|
||||
@@ -503,9 +481,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/tourmut/Initialize()
|
||||
block = GLOB.twitchblock
|
||||
..()
|
||||
/obj/item/dnainjector/tourmut/GetInitBlock()
|
||||
return GLOB.twitchblock
|
||||
|
||||
/obj/item/dnainjector/stuttmut
|
||||
name = "DNA-Injector (Stutt.)"
|
||||
@@ -514,9 +491,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/stuttmut/Initialize()
|
||||
block = GLOB.nervousblock
|
||||
..()
|
||||
/obj/item/dnainjector/stuttmut/GetInitBlock()
|
||||
return GLOB.nervousblock
|
||||
|
||||
|
||||
/obj/item/dnainjector/antistutt
|
||||
@@ -526,9 +502,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antistutt/Initialize()
|
||||
block = GLOB.nervousblock
|
||||
..()
|
||||
/obj/item/dnainjector/antistutt/GetInitBlock()
|
||||
return GLOB.nervousblock
|
||||
|
||||
/obj/item/dnainjector/blindmut
|
||||
name = "DNA-Injector (Blind)"
|
||||
@@ -537,9 +512,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/blindmut/Initialize()
|
||||
block = GLOB.blindblock
|
||||
..()
|
||||
/obj/item/dnainjector/blindmut/GetInitBlock()
|
||||
return GLOB.blindblock
|
||||
|
||||
/obj/item/dnainjector/antiblind
|
||||
name = "DNA-Injector (Anti-Blind)"
|
||||
@@ -548,9 +522,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antiblind/Initialize()
|
||||
block = GLOB.blindblock
|
||||
..()
|
||||
/obj/item/dnainjector/antiblind/GetInitBlock()
|
||||
return GLOB.blindblock
|
||||
|
||||
/obj/item/dnainjector/deafmut
|
||||
name = "DNA-Injector (Deaf)"
|
||||
@@ -559,9 +532,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/deafmut/Initialize()
|
||||
block = GLOB.deafblock
|
||||
..()
|
||||
/obj/item/dnainjector/deafmut/GetInitBlock()
|
||||
return GLOB.deafblock
|
||||
|
||||
/obj/item/dnainjector/antideaf
|
||||
name = "DNA-Injector (Anti-Deaf)"
|
||||
@@ -570,9 +542,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antideaf/Initialize()
|
||||
block = GLOB.deafblock
|
||||
..()
|
||||
/obj/item/dnainjector/antideaf/GetInitBlock()
|
||||
return GLOB.deafblock
|
||||
|
||||
/obj/item/dnainjector/hallucination
|
||||
name = "DNA-Injector (Halluctination)"
|
||||
@@ -581,9 +552,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/hallucination/Initialize()
|
||||
block = GLOB.hallucinationblock
|
||||
..()
|
||||
/obj/item/dnainjector/hallucination/GetInitBlock()
|
||||
return GLOB.hallucinationblock
|
||||
|
||||
/obj/item/dnainjector/antihallucination
|
||||
name = "DNA-Injector (Anti-Hallucination)"
|
||||
@@ -592,9 +562,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/antihallucination/Initialize()
|
||||
block = GLOB.hallucinationblock
|
||||
..()
|
||||
/obj/item/dnainjector/antihallucination/GetInitBlock()
|
||||
return GLOB.hallucinationblock
|
||||
|
||||
/obj/item/dnainjector/h2m
|
||||
name = "DNA-Injector (Human > Monkey)"
|
||||
@@ -603,9 +572,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/h2m/Initialize()
|
||||
block = GLOB.monkeyblock
|
||||
..()
|
||||
/obj/item/dnainjector/h2m/GetInitBlock()
|
||||
return GLOB.monkeyblock
|
||||
|
||||
/obj/item/dnainjector/m2h
|
||||
name = "DNA-Injector (Monkey > Human)"
|
||||
@@ -614,9 +582,8 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/m2h/Initialize()
|
||||
block = GLOB.monkeyblock
|
||||
..()
|
||||
/obj/item/dnainjector/m2h/GetInitBlock()
|
||||
return GLOB.monkeyblock
|
||||
|
||||
|
||||
/obj/item/dnainjector/comic
|
||||
@@ -626,9 +593,8 @@
|
||||
value = 0xFFF
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/comic/Initialize()
|
||||
block = GLOB.comicblock
|
||||
..()
|
||||
/obj/item/dnainjector/comic/GetInitBlock()
|
||||
return GLOB.comicblock
|
||||
|
||||
/obj/item/dnainjector/anticomic
|
||||
name = "DNA-Injector (Ant-Comic)"
|
||||
@@ -637,6 +603,5 @@
|
||||
value = 0x001
|
||||
forcedmutation = TRUE
|
||||
|
||||
/obj/item/dnainjector/anticomic/Initialize()
|
||||
block = GLOB.comicblock
|
||||
..()
|
||||
/obj/item/dnainjector/anticomic/GetInitBlock()
|
||||
return GLOB.comicblock
|
||||
|
||||
@@ -565,7 +565,7 @@
|
||||
origin_tech = "combat=4;bluespace=4;plasmatech=7"
|
||||
|
||||
/obj/item/singularityhammer/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/two_handed, \
|
||||
force_wielded = 40, \
|
||||
force_unwielded = force, \
|
||||
@@ -634,7 +634,7 @@
|
||||
origin_tech = "combat=4;powerstorage=7"
|
||||
|
||||
/obj/item/mjollnir/Initialize(mapload)
|
||||
..()
|
||||
. = ..()
|
||||
AddComponent(/datum/component/two_handed, \
|
||||
force_wielded = 25, \
|
||||
force_unwielded = force, \
|
||||
|
||||
Reference in New Issue
Block a user