diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 313aef8fd3..70592e6c62 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -169,6 +169,8 @@
..()
/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0)
+ if(tesla_shock && tesla_ignore)
+ return FALSE
shock_damage *= siemens_coeff
if(dna && dna.species)
shock_damage *= dna.species.siemens_coeff
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index cbb711ffc2..5b7e2e28c6 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -448,6 +448,8 @@
if(S.siemens_coefficient <= 0)
total_coeff -= 0.95
siemens_coeff = total_coeff
+ if(tesla_ignore)
+ siemens_coeff = 0
else if(!safety)
var/gloves_siemens_coeff = 1
if(gloves)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index ac59c61ba8..ac631e8095 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -85,9 +85,13 @@
message_alien = "lets out a waning guttural screech, green blood bubbling from its maw..."
message_larva = "lets out a sickly hiss of air and falls limply to the floor..."
message_monkey = "lets out a faint chimper as it collapses and stops moving..."
+ message_simple = "stops moving..."
stat_allowed = UNCONSCIOUS
/datum/emote/living/deathgasp/run_emote(mob/user, params)
+ var/mob/living/simple_animal/S = user
+ if(istype(S) && S.deathmessage)
+ message_simple = S.deathmessage
. = ..()
if(. && isalienadult(user))
playsound(user.loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index b4261c77ce..8486f85145 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -276,6 +276,8 @@
/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0)
+ if(tesla_shock && tesla_ignore)
+ return FALSE
if(shock_damage > 0)
if(!illusion)
adjustFireLoss(shock_damage)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 8105c4e13f..033916892b 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -74,4 +74,5 @@
var/list/status_effects //a list of all status effects the mob has
- var/list/implants = null
\ No newline at end of file
+ var/list/implants = null
+ var/tesla_ignore = FALSE
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index a2e0812922..dc31ff23d1 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -45,6 +45,11 @@
laws_sanity_check()
laws.replace_random_law(law,groups)
+/mob/living/silicon/proc/remove_law(number)
+ throw_alert("newlaw", /obj/screen/alert/newlaw)
+ laws_sanity_check()
+ laws.remove_law(number)
+
/mob/living/silicon/proc/clear_ion_laws()
throw_alert("newlaw", /obj/screen/alert/newlaw)
laws_sanity_check()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 59e0106531..6b04e762bf 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -220,27 +220,47 @@
/obj/item/weapon/robot_module/standard
name = "Standard"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/reagent_containers/borghypo/epi, /obj/item/device/healthanalyzer, \
- /obj/item/weapon/weldingtool/largetank/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/crowbar/cyborg, \
- /obj/item/stack/sheet/metal/cyborg, /obj/item/weapon/extinguisher, /obj/item/weapon/pickaxe, \
- /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg, \
- /obj/item/weapon/soap/nanotrasen, /obj/item/borg/cyborghug)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/reagent_containers/borghypo/epi,
+ /obj/item/weapon/crowbar/cyborg,
+ /obj/item/weapon/extinguisher,
+ /obj/item/weapon/soap/nanotrasen,
+ /obj/item/borg/cyborghug)
emag_modules = list(/obj/item/weapon/melee/energy/sword/cyborg)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg, /obj/item/clockwork/ratvarian_spear/cyborg, /obj/item/clockwork/clockwork_proselytizer/cyborg)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg,
+ /obj/item/clockwork/ratvarian_spear/cyborg,
+ /obj/item/clockwork/clockwork_proselytizer/cyborg)
moduleselect_icon = "standard"
feedback_key = "cyborg_standard"
hat_offset = -3
/obj/item/weapon/robot_module/medical
name = "Medical"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/device/healthanalyzer, /obj/item/weapon/reagent_containers/borghypo, \
- /obj/item/weapon/reagent_containers/glass/beaker/large, /obj/item/weapon/reagent_containers/dropper, \
- /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/surgical_drapes, /obj/item/weapon/retractor, \
- /obj/item/weapon/hemostat, /obj/item/weapon/cautery, /obj/item/weapon/surgicaldrill, /obj/item/weapon/scalpel, \
- /obj/item/weapon/circular_saw, /obj/item/weapon/extinguisher/mini, /obj/item/roller/robo, /obj/item/borg/cyborghug/medical, \
- /obj/item/stack/medical/gauze/cyborg, /obj/item/borg/lollipop)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/device/healthanalyzer,
+ /obj/item/weapon/reagent_containers/borghypo,
+ /obj/item/weapon/reagent_containers/glass/beaker/large,
+ /obj/item/weapon/reagent_containers/dropper,
+ /obj/item/weapon/reagent_containers/syringe,
+ /obj/item/weapon/surgical_drapes,
+ /obj/item/weapon/retractor,
+ /obj/item/weapon/hemostat,
+ /obj/item/weapon/cautery,
+ /obj/item/weapon/surgicaldrill,
+ /obj/item/weapon/scalpel,
+ /obj/item/weapon/circular_saw,
+ /obj/item/weapon/extinguisher/mini,
+ /obj/item/roller/robo,
+ /obj/item/borg/cyborghug/medical,
+ /obj/item/stack/medical/gauze/cyborg,
+ /obj/item/borg/lollipop)
emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/hacked)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical, /obj/item/clockwork/ratvarian_spear/cyborg)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/medical,
+ /obj/item/clockwork/ratvarian_spear/cyborg)
cyborg_base_icon = "medical"
moduleselect_icon = "medical"
feedback_key = "cyborg_medical"
@@ -249,14 +269,32 @@
/obj/item/weapon/robot_module/engineering
name = "Engineering"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/borg/sight/meson, /obj/item/weapon/rcd/borg, /obj/item/weapon/pipe_dispenser, \
- /obj/item/weapon/extinguisher, /obj/item/weapon/weldingtool/largetank/cyborg, /obj/item/weapon/screwdriver/cyborg, \
- /obj/item/weapon/wrench/cyborg, /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, \
- /obj/item/device/multitool/cyborg, /obj/item/device/t_scanner, /obj/item/device/analyzer, \
- /obj/item/areaeditor/blueprints/cyborg, /obj/item/stack/sheet/metal/cyborg, /obj/item/stack/sheet/glass/cyborg, \
- /obj/item/stack/sheet/rglass/cyborg, /obj/item/stack/rods/cyborg, /obj/item/stack/tile/plasteel/cyborg, /obj/item/stack/cable_coil/cyborg)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/borg/sight/meson,
+ /obj/item/weapon/rcd/borg,
+ /obj/item/weapon/pipe_dispenser,
+ /obj/item/weapon/extinguisher,
+ /obj/item/weapon/weldingtool/largetank/cyborg,
+ /obj/item/weapon/screwdriver/cyborg,
+ /obj/item/weapon/wrench/cyborg,
+ /obj/item/weapon/crowbar/cyborg,
+ /obj/item/weapon/wirecutters/cyborg,
+ /obj/item/device/multitool/cyborg,
+ /obj/item/device/t_scanner,
+ /obj/item/device/analyzer,
+ /obj/item/device/assembly/signaler/cyborg,
+ /obj/item/areaeditor/blueprints/cyborg,
+ /obj/item/stack/sheet/metal/cyborg,
+ /obj/item/stack/sheet/glass/cyborg,
+ /obj/item/stack/sheet/rglass/cyborg,
+ /obj/item/stack/rods/cyborg,
+ /obj/item/stack/tile/plasteel/cyborg,
+ /obj/item/stack/cable_coil/cyborg)
emag_modules = list(/obj/item/borg/stun)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/engineer, /obj/item/clockwork/clockwork_proselytizer/cyborg)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/engineer,
+ /obj/item/clockwork/clockwork_proselytizer/cyborg)
cyborg_base_icon = "engineer"
moduleselect_icon = "engineer"
feedback_key = "cyborg_engineering"
@@ -265,10 +303,15 @@
/obj/item/weapon/robot_module/security
name = "Security"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg, /obj/item/weapon/melee/baton/loaded, \
- /obj/item/weapon/gun/energy/disabler/cyborg, /obj/item/clothing/mask/gas/sechailer/cyborg)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg,
+ /obj/item/weapon/melee/baton/loaded,
+ /obj/item/weapon/gun/energy/disabler/cyborg,
+ /obj/item/clothing/mask/gas/sechailer/cyborg)
emag_modules = list(/obj/item/weapon/gun/energy/laser/cyborg)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security, /obj/item/clockwork/ratvarian_spear/cyborg)
+ ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
+ /obj/item/clockwork/ratvarian_spear/cyborg)
cyborg_base_icon = "sec"
moduleselect_icon = "security"
feedback_key = "cyborg_security"
@@ -293,10 +336,18 @@
/obj/item/weapon/robot_module/peacekeeper
name = "Peacekeeper"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/cookiesynth, /obj/item/device/harmalarm, /obj/item/weapon/reagent_containers/borghypo/peace, \
- /obj/item/weapon/holosign_creator/cyborg, /obj/item/borg/cyborghug/peacekeeper, /obj/item/weapon/extinguisher)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/cookiesynth,
+ /obj/item/device/harmalarm,
+ /obj/item/weapon/reagent_containers/borghypo/peace,
+ /obj/item/weapon/holosign_creator/cyborg,
+ /obj/item/borg/cyborghug/peacekeeper,
+ /obj/item/weapon/extinguisher)
emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/peace/hacked)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/peacekeeper, /obj/item/clockwork/ratvarian_spear/cyborg)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/peacekeeper,
+ /obj/item/clockwork/ratvarian_spear/cyborg)
cyborg_base_icon = "peace"
moduleselect_icon = "standard"
feedback_key = "cyborg_peacekeeper"
@@ -310,10 +361,18 @@
/obj/item/weapon/robot_module/janitor
name = "Janitor"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/soap/nanotrasen, /obj/item/weapon/storage/bag/trash/cyborg, /obj/item/weapon/mop/cyborg, \
- /obj/item/device/lightreplacer/cyborg, /obj/item/weapon/holosign_creator, /obj/item/weapon/reagent_containers/spray/cyborg_drying)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/soap/nanotrasen,
+ /obj/item/weapon/storage/bag/trash/cyborg,
+ /obj/item/weapon/mop/cyborg,
+ /obj/item/device/lightreplacer/cyborg,
+ /obj/item/weapon/holosign_creator,
+ /obj/item/weapon/reagent_containers/spray/cyborg_drying)
emag_modules = list(/obj/item/weapon/reagent_containers/spray/cyborg_lube)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/janitor, /obj/item/clockwork/clockwork_proselytizer/cyborg)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/janitor,
+ /obj/item/clockwork/clockwork_proselytizer/cyborg)
cyborg_base_icon = "janitor"
moduleselect_icon = "janitor"
feedback_key = "cyborg_janitor"
@@ -345,12 +404,25 @@
/obj/item/weapon/robot_module/butler
name = "Service"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass, /obj/item/weapon/reagent_containers/food/condiment/enzyme, \
- /obj/item/weapon/pen, /obj/item/toy/crayon/spraycan/borg, /obj/item/weapon/hand_labeler/borg, /obj/item/weapon/razor, \
- /obj/item/device/instrument/violin, /obj/item/device/instrument/guitar, /obj/item/weapon/rsf/cyborg, /obj/item/weapon/reagent_containers/dropper, \
- /obj/item/weapon/lighter, /obj/item/weapon/storage/bag/tray, /obj/item/weapon/reagent_containers/borghypo/borgshaker, /obj/item/borg/lollipop)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass,
+ /obj/item/weapon/reagent_containers/food/condiment/enzyme,
+ /obj/item/weapon/pen,
+ /obj/item/toy/crayon/spraycan/borg,
+ /obj/item/weapon/hand_labeler/borg,
+ /obj/item/weapon/razor,
+ /obj/item/device/instrument/violin,
+ /obj/item/device/instrument/guitar,
+ /obj/item/weapon/rsf/cyborg,
+ /obj/item/weapon/reagent_containers/dropper,
+ /obj/item/weapon/lighter,
+ /obj/item/weapon/storage/bag/tray,
+ /obj/item/weapon/reagent_containers/borghypo/borgshaker,
+ /obj/item/borg/lollipop)
emag_modules = list(/obj/item/weapon/reagent_containers/borghypo/borgshaker/hacked)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/service, /obj/item/borg/sight/xray/truesight_lens)
+ ratvar_modules = list(/obj/item/clockwork/slab/cyborg/service,
+ /obj/item/borg/sight/xray/truesight_lens)
moduleselect_icon = "service"
special_light_key = "service"
feedback_key = "cyborg_service"
@@ -386,11 +458,24 @@
/obj/item/weapon/robot_module/miner
name = "Miner"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/borg/sight/meson, /obj/item/weapon/storage/bag/ore/cyborg, /obj/item/weapon/pickaxe/drill/cyborg, /obj/item/weapon/shovel, \
- /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/weldingtool/mini, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/storage/bag/sheetsnatcher/borg, \
- /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg, /obj/item/device/gps/cyborg)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/borg/sight/meson,
+ /obj/item/weapon/storage/bag/ore/cyborg,
+ /obj/item/weapon/pickaxe/drill/cyborg,
+ /obj/item/weapon/shovel,
+ /obj/item/weapon/crowbar/cyborg,
+ /obj/item/weapon/weldingtool/mini,
+ /obj/item/weapon/extinguisher/mini,
+ /obj/item/weapon/storage/bag/sheetsnatcher/borg,
+ /obj/item/device/t_scanner/adv_mining_scanner,
+ /obj/item/weapon/gun/energy/kinetic_accelerator/cyborg,
+ /obj/item/device/gps/cyborg)
emag_modules = list(/obj/item/borg/stun)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/miner, /obj/item/clockwork/ratvarian_spear/cyborg, /obj/item/borg/sight/xray/truesight_lens)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/miner,
+ /obj/item/clockwork/ratvarian_spear/cyborg,
+ /obj/item/borg/sight/xray/truesight_lens)
cyborg_base_icon = "miner"
moduleselect_icon = "miner"
feedback_key = "cyborg_miner"
@@ -398,10 +483,18 @@
/obj/item/weapon/robot_module/syndicate
name = "Syndicate Assault"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/melee/energy/sword/cyborg, /obj/item/weapon/gun/energy/printer, \
- /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg, /obj/item/weapon/card/emag, /obj/item/weapon/crowbar/cyborg, \
- /obj/item/weapon/pinpointer/syndicate/cyborg)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security, /obj/item/clockwork/ratvarian_spear/cyborg)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/melee/energy/sword/cyborg,
+ /obj/item/weapon/gun/energy/printer,
+ /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg,
+ /obj/item/weapon/card/emag,
+ /obj/item/weapon/crowbar/cyborg,
+ /obj/item/weapon/pinpointer/syndicate/cyborg)
+
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/security,
+ /obj/item/clockwork/ratvarian_spear/cyborg)
cyborg_base_icon = "synd_sec"
moduleselect_icon = "malf"
can_be_pushed = FALSE
@@ -409,11 +502,26 @@
/obj/item/weapon/robot_module/syndicate_medical
name = "Syndicate Medical"
- basic_modules = list(/obj/item/device/assembly/flash/cyborg, /obj/item/weapon/reagent_containers/borghypo/syndicate, /obj/item/weapon/twohanded/shockpaddles/syndicate, \
- /obj/item/device/healthanalyzer, /obj/item/weapon/surgical_drapes, /obj/item/weapon/retractor, /obj/item/weapon/hemostat, \
- /obj/item/weapon/cautery, /obj/item/weapon/scalpel, /obj/item/weapon/melee/energy/sword/cyborg/saw, /obj/item/roller/robo, \
- /obj/item/weapon/card/emag, /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/pinpointer/syndicate/cyborg, /obj/item/stack/medical/gauze/cyborg, /obj/item/weapon/gun/medbeam)
- ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical, /obj/item/clockwork/ratvarian_spear/cyborg)
+ basic_modules = list(
+ /obj/item/device/assembly/flash/cyborg,
+ /obj/item/weapon/reagent_containers/borghypo/syndicate,
+ /obj/item/weapon/twohanded/shockpaddles/syndicate,
+ /obj/item/device/healthanalyzer,
+ /obj/item/weapon/surgical_drapes,
+ /obj/item/weapon/retractor,
+ /obj/item/weapon/hemostat,
+ /obj/item/weapon/cautery,
+ /obj/item/weapon/scalpel,
+ /obj/item/weapon/melee/energy/sword/cyborg/saw,
+ /obj/item/roller/robo,
+ /obj/item/weapon/card/emag,
+ /obj/item/weapon/crowbar/cyborg,
+ /obj/item/weapon/pinpointer/syndicate/cyborg,
+ /obj/item/stack/medical/gauze/cyborg,
+ /obj/item/weapon/gun/medbeam)
+ ratvar_modules = list(
+ /obj/item/clockwork/slab/cyborg/medical,
+ /obj/item/clockwork/ratvarian_spear/cyborg)
cyborg_base_icon = "synd_medical"
moduleselect_icon = "malf"
can_be_pushed = FALSE
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index f08014b927..f74b19b93d 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -228,9 +228,8 @@
if (length(law) > 0)
if (force || src.lawcheck[index+1] == "Yes")
src.say("[radiomod] [number]. [law]")
+ number++
sleep(10)
- number++
-
for (var/index = 1, index <= src.laws.supplied.len, index++)
var/law = src.laws.supplied[index]
@@ -239,8 +238,8 @@
if(src.lawcheck.len >= number+1)
if (force || src.lawcheck[number+1] == "Yes")
src.say("[radiomod] [number]. [law]")
+ number++
sleep(10)
- number++
/mob/living/silicon/proc/checklaws() //Gives you a link-driven interface for deciding what laws the statelaws() proc will share with the crew. --NeoFite
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index e2beff5d83..65172fc9a1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -526,7 +526,7 @@ Difficulty: Very Hard
/obj/machinery/anomalous_crystal/emitter/New()
..()
- generated_projectile = pick(/obj/item/projectile/magic/fireball/infernal,/obj/item/projectile/magic/spellblade,
+ generated_projectile = pick(/obj/item/projectile/magic/aoe/fireball/infernal,/obj/item/projectile/magic/aoe/lightning,/obj/item/projectile/magic/spellblade,
/obj/item/projectile/bullet/meteorshot, /obj/item/projectile/beam/xray, /obj/item/projectile/colossus)
/obj/machinery/anomalous_crystal/emitter/ActivationReaction(mob/user, method)
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index ca9bb1130e..d51765e4da 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -29,7 +29,7 @@
loot = list(/obj/effect/mob_spawn/human/corpse/wizard,
/obj/item/weapon/staff)
- var/obj/effect/proc_holder/spell/fireball/fireball = null
+ var/obj/effect/proc_holder/spell/aimed/fireball/fireball = null
var/obj/effect/proc_holder/spell/targeted/turf_teleport/blink/blink = null
var/obj/effect/proc_holder/spell/targeted/projectile/magic_missile/mm = null
@@ -38,7 +38,7 @@
/mob/living/simple_animal/hostile/wizard/New()
..()
- fireball = new /obj/effect/proc_holder/spell/fireball
+ fireball = new /obj/effect/proc_holder/spell/aimed/fireball
fireball.clothes_req = 0
fireball.human_req = 0
fireball.player_lock = 0
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1da8d9c5f0..8770fa79a1 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -299,10 +299,8 @@
if(!gibbed)
if(death_sound)
playsound(get_turf(src),death_sound, 200, 1)
- if(deathmessage)
- visible_message("\The [src] [deathmessage]")
- else if(!del_on_death)
- visible_message("\The [src] stops moving...")
+ if(deathmessage && !del_on_death)
+ emote("deathgasp")
if(del_on_death)
ghostize()
//Prevent infinite loops if the mob Destroy() is overriden in such
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index 422a64f2d3..c6627a92e3 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -2,7 +2,6 @@
SStgui.on_logout(src)
unset_machine()
player_list -= src
- current_watchlist -= ckey
log_access("Logout: [key_name(src)]")
if(admin_datums[src.ckey])
if (ticker && ticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
@@ -28,7 +27,6 @@
send2irc("Server", "[cheesy_message]")
- send2admindiscord("[cheesy_message]")
..()
if(isobj(loc))
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 95a7fb26ba..9112420e34 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -103,8 +103,6 @@
if(href_list["ready"])
if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
ready = text2num(href_list["ready"])
- else
- ready = 0
if(href_list["refresh"])
src << browse(null, "window=playersetup") //closes the player setup window