Skip to content

Commit e3eac14

Browse files
authored
Feburary Issue Report fixes (#5336)
## About The Pull Request Just a big bulk of fixes for more of the simplier issues still on the issue tracker and some smaller bug fixes for things I encountered. removes legion tumor from All In One Organ printer fixes #765 lets you light a match from an ethereal's body. fixes? #3718 Ash walker ceremonies that require human types as a component now requires them to be dead as well. fixes #2548 Smart chem fridges and viral fridges allow virusdish storage. fixes #5172 Assume form ability requires a same zlevel check on assuming a form. fixes #634 Removes blood requirement from PKAmod death siphon. fixes #5244 Rewards vent discovery points after the vent has been scanned. fixes #5006 Ore vents without an assigned material will correctly denote it gives random ores. Defines circuit board for grounding rod, fixes initial map spawned rods deleting when deconstructed. fixes #1393 ## Why It's Good For The Game ## Changelog :cl:Siro fix: fixes various bugs check PR for list. /:cl:
1 parent 87f2028 commit e3eac14

File tree

8 files changed

+42
-14
lines changed

8 files changed

+42
-14
lines changed

code/datums/actions/mobs/assume_form.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
/datum/action/cooldown/mob_cooldown/assume_form/proc/can_assume_form(atom/target_atom)
3939
if(is_type_in_typecache(target_atom, blacklist_typecache) || (!isobj(target_atom) && !ismob(target_atom)))
4040
return FALSE
41+
if(usr.z != target_atom.z) // Fixes invisibility bug
42+
return FALSE
4143

4244
return TRUE
4345

code/modules/food_and_drinks/machinery/smartfridge.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,13 @@
493493
return FALSE
494494
return TRUE
495495
return FALSE
496+
if(istype(O, /obj/item/weapon/virusdish) && is_type_in_typecache(O, chemfridge_typecache))
497+
return TRUE
496498
if(!is_reagent_container(O) || (O.item_flags & ABSTRACT))
497499
return FALSE
498500
if(istype(O, /obj/item/reagent_containers/pill)) // empty pill prank ok
499501
return TRUE
500-
if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted
502+
if(!O.reagents || !length(O.reagents.reagent_list)) // other empty containers not accepted
501503
return FALSE
502504
if(is_type_in_typecache(O, chemfridge_typecache))
503505
return TRUE

code/modules/mining/lavaland/tendril_loot.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
desc = "A device which causes kinetic accelerators to permanently gain damage against creature types killed with it."
6161
id = "bountymod"
6262
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/gold = SHEET_MATERIAL_AMOUNT*2, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT*2)
63-
reagents_list = list(/datum/reagent/blood = 40)
63+
//reagents_list = list(/datum/reagent/blood = 40) monkeedit
6464
build_path = /obj/item/borg/upgrade/modkit/bounty
6565

6666
//Spooky special loot

code/modules/power/tesla/coil.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@
123123
density = TRUE
124124
wants_powernet = FALSE
125125

126+
circuit = /obj/item/circuitboard/machine/grounding_rod
127+
126128
can_buckle = TRUE
127129
buckle_lying = 0
128130
buckle_requires_restraints = TRUE

monkestation/code/modules/blueshift/effects/ash_walker.dm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@
8787
return FALSE
8888

8989
if(is_type_in_list(atom_check, consumed_components))
90+
// If the component is a human, ensure it is dead
91+
if(istype(atom_check, /mob/living/carbon/human))
92+
var/mob/living/carbon/human/human_target = atom_check
93+
if(human_target.stat != DEAD) // If they are alive, fail the ritual
94+
checked_rune.balloon_alert_to_viewers("The sacrifice is still alive!")
95+
ritual_fail(checked_rune)
96+
return FALSE
97+
9098
qdel(atom_check)
9199
checked_rune.balloon_alert_to_viewers("[checked_component] component has been consumed...")
92100

monkestation/code/modules/factory_type_beat/ore_vent.dm

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,11 @@
288288
if(do_after(user, 4 SECONDS))
289289
discovered = TRUE
290290
balloon_alert(user, "vent scanned!")
291-
generate_description(user)
292-
var/obj/item/card/id/user_id_card = user.get_idcard(TRUE)
293-
if(isnull(user_id_card))
294-
return
295-
user_id_card.registered_account.mining_points += (MINER_POINT_MULTIPLIER)
296-
user_id_card.registered_account.bank_card_talk("You've been awarded [MINER_POINT_MULTIPLIER] mining points for discovery of an ore vent.")
291+
var/obj/item/card/id/user_id_card = user.get_idcard(TRUE)
292+
if(!isnull(user_id_card))
293+
user_id_card.registered_account.mining_points += (MINER_POINT_MULTIPLIER)
294+
user_id_card.registered_account.bank_card_talk("You've been awarded [MINER_POINT_MULTIPLIER] mining points for discovery of an ore vent.")
295+
generate_description(user)
297296
return
298297

299298
if(tgui_alert(user, excavation_warning, "Begin defending ore vent?", list("Yes", "No")) != "Yes")
@@ -330,6 +329,8 @@
330329
ore_string += "and " + span_bold(initial(resource.name)) + "."
331330
else
332331
ore_string += span_bold(initial(resource.name)) + ", "
332+
if(!length(ore_string))
333+
ore_string += "random ores."
333334
if(user)
334335
ore_string += "\nThis vent was first discovered by [user]."
335336
/**

monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/obj/structure/organ_creator/attack_hand(mob/living/user, list/modifiers)
1515
. = ..()
16-
var/list/all_internals = subtypesof(/obj/item/organ/internal) - typesof(/obj/item/organ/internal/zombie_infection) - typesof(/obj/item/organ/internal/alien) - typesof(/obj/item/organ/internal/body_egg) - typesof(/obj/item/organ/internal/heart/gland) - /obj/item/organ/internal/butt/atomic - typesof(/obj/item/organ/internal/alien) - /obj/item/organ/internal/borer_body - /obj/item/organ/internal/empowered_borer_egg // bit long aint it
16+
var/list/all_internals = subtypesof(/obj/item/organ/internal) - typesof(/obj/item/organ/internal/zombie_infection) - typesof(/obj/item/organ/internal/alien) - typesof(/obj/item/organ/internal/body_egg) - typesof(/obj/item/organ/internal/heart/gland) - /obj/item/organ/internal/butt/atomic - typesof(/obj/item/organ/internal/alien) - /obj/item/organ/internal/borer_body - /obj/item/organ/internal/empowered_borer_egg - /obj/item/organ/internal/legion_tumour// bit long aint it
1717
var/list/all_externals = subtypesof(/obj/item/organ/external)
1818

1919
var/list/all_bodyparts = subtypesof(/obj/item/bodypart)

monkestation/code/modules/mob/living/carbon/human/species_type/ethereal.dm

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,25 @@
197197

198198
/datum/species/ethereal/proc/on_after_attackedby(mob/living/lightbulb, obj/item/item, mob/living/user, proximity_flag, click_parameters)
199199
SIGNAL_HANDLER
200-
var/obj/item/clothing/mask/cigarette/cig = item
201-
if(!proximity_flag || !istype(cig) || !istype(user) || cig.lit)
200+
if(!proximity_flag || !istype(user))
202201
return
203-
cig.light()
204-
user.visible_message(span_notice("[user] quickly strikes [item] across [lightbulb]'s skin, [lightbulb.p_their()] warmth lighting it!"))
205-
return COMPONENT_NO_AFTERATTACK
202+
203+
if(istype(item, /obj/item/clothing/mask/cigarette))
204+
var/obj/item/clothing/mask/cigarette/cig = item
205+
if(!cig.lit)
206+
cig.light()
207+
user.visible_message(span_notice("[user] quickly strikes [item] across [lightbulb]'s skin, [lightbulb.p_their()] warmth lighting it!"))
208+
return COMPONENT_NO_AFTERATTACK
209+
return
210+
211+
if(istype(item, /obj/item/match))
212+
var/obj/item/match/match = item
213+
if(!match.lit)
214+
match.matchignite()
215+
user.visible_message(span_notice("[user] strikes [item] against [lightbulb], sparking it to life!"))
216+
return COMPONENT_NO_AFTERATTACK
217+
return
218+
return
206219

207220
/datum/species/ethereal/get_species_description()
208221
return "Coming from the planet of Sprout, the theocratic ethereals are \

0 commit comments

Comments
 (0)