From 97f5bf1bf87e50e16c01f08d8dba84cc5fe1b8ac Mon Sep 17 00:00:00 2001 From: ThePooba <81843097+ThePooba@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:20:54 -0700 Subject: [PATCH] more blugfixes (#4612) * added no interact to fartlight spear so you cant switch hands with it * thing * rem oves debug items from gifts * blacklisted debug and shitass items * uhh bugfix * fix maybe --- code/_globalvars/lists/maintenance_loot.dm | 2 +- code/game/objects/items/gift.dm | 17 ++++++++++++----- code/game/objects/structures/flora.dm | 4 ++-- code/modules/holiday/holidays.dm | 3 +-- .../effects/anomalies/anomalies_lifebringer.dm | 2 +- .../game/objects/items/implants/hardlight.dm | 5 +++++ .../art_sci_overrides/artifact_effects/bomb.dm | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index c60c9105f541..bcb83d5d97e5 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -400,7 +400,7 @@ GLOBAL_LIST_INIT(maint_fauna, list(//fauna: there be critters living in yer main #define maint_uncommon_weight 900 #define maint_rarity_weight 99 #define maint_oddity_weight 4 //1 out of 10,000 would give metastation (180 spawns) a 2 in 111 chance of spawning an oddity per round, similar to xeno egg, monkestation edit: from 1 to 4 -#define maint_holiday_weight 2500 // When holiday loot is enabled, it'll give every loot item a 25% chance of being a holiday item +#define maint_holiday_weight 3500 // When holiday loot is enabled, it'll give every loot item a 25% chance of being a holiday item #define maint_fauna_weight 150 //monkestation edit: adds friendly maintenance bees, also allows for other maintenance fauna to be coded in. //Loot pool used by default maintenance loot spawners diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 1b419999f47c..c1a5e10a1b38 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -116,17 +116,24 @@ GLOBAL_LIST_EMPTY(possible_gifts) // // Subtypes of these items will also be blocked. var/list/blocked_items = list( - // Can crash people if too many are spawned. - // NOTE: Not likely to be an issue if the amount is kept low - perhaps a limited variant - // of this (i.e. can only spawn up to 25 humans) could be added for players to use? - /obj/item/debug/human_spawner, // Just leaves the coordinates everywhere /obj/item/gps/visible_debug, // Can lag the hell out of the server /obj/item/gun/energy/recharge/kinetic_accelerator/meme, // Per Biddi's suggestion; plus doesn't seem to do much anyways? /obj/item/research, - ) + //only upsets people consistantly + /obj/item/gun/magic/wand/death, + /obj/item/gun/magic/wand/resurrection/debug, + //holy fuck why was this enabled + /obj/item/debug, + /obj/item/storage/box/debugtools, + /obj/item/gun/energy/beam_rifle/debug, + /obj/item/multitool/field_debug, + /obj/item/bounty_cube/debug_cube, + /obj/item/organ/internal/cyberimp/brain/nif/debug, + /obj/item/spellbook_charge/debug, + ) for(var/blocked_item as anything in blocked_items) // Block the item listed, and any subtypes too. gift_types_list -= typesof(blocked_item) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0030e5543b4e..d3c0482462e7 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -462,10 +462,10 @@ if(!unlimited) took_presents[user.ckey] = TRUE - if(prob(50)) + if(prob(5)) user.put_in_hands(new gift_type(drop_location())) return - if(prob(1)) + if(prob(1)) //evil pooba monke moment new /mob/living/carbon/human/species/monkey/angry(drop_location()) to_chat(user, span_warning("A live monkey crawls out of the gift... its PISSED!!!")) return diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index ea1426515a5d..17a2cbc9656e 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -816,8 +816,7 @@ list( /obj/item/toy/xmas_cracker = 3, /obj/item/clothing/head/costume/santa = 1, - /obj/item/a_gift/anything = 1, - /obj/item/a_gift = 4 + /obj/item/a_gift/anything = 1 ) = maint_holiday_weight, ) diff --git a/monkestation/code/game/objects/effects/anomalies/anomalies_lifebringer.dm b/monkestation/code/game/objects/effects/anomalies/anomalies_lifebringer.dm index 35582d25aa6e..5f1d506dcc06 100644 --- a/monkestation/code/game/objects/effects/anomalies/anomalies_lifebringer.dm +++ b/monkestation/code/game/objects/effects/anomalies/anomalies_lifebringer.dm @@ -43,7 +43,7 @@ active = FALSE var/turf/open/tile = get_turf(src) if(istype(tile)) - tile.atmos_spawn_air("o2=10;plasma=1;TEMP=3000") + tile.atmos_spawn_air("o2=45;plasma=15;TEMP=6000") return var/mob/living/basic/pet/chosen_pet = pick(pet_type_cache) diff --git a/monkestation/code/game/objects/items/implants/hardlight.dm b/monkestation/code/game/objects/items/implants/hardlight.dm index d85536126869..daa5078b77a4 100644 --- a/monkestation/code/game/objects/items/implants/hardlight.dm +++ b/monkestation/code/game/objects/items/implants/hardlight.dm @@ -189,6 +189,7 @@ righthand_file = 'monkestation/icons/mob/inhands/polearms_righthand.dmi' slot_flags = null can_charge = FALSE //ITS A SPEAR + interaction_flags_item = NONE item_flags = NEEDS_PERMIT | DROPDEL | ABSTRACT | NO_MAT_REDEMPTION resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF light_system = OVERLAY_LIGHT @@ -198,6 +199,10 @@ var/spears_left = 5 ammo_type = /obj/item/ammo_casing/magic/hardlight_spear +//obj/item/gun/magic/hardlight_spear/attack_hand(mob/user, list/modifiers) +// . = ..() + + /obj/item/gun/magic/hardlight_spear/Initialize(mapload) . = ..() AddComponent(/datum/component/jousting) diff --git a/monkestation/code/modules/art_sci_overrides/artifact_effects/bomb.dm b/monkestation/code/modules/art_sci_overrides/artifact_effects/bomb.dm index 56ec1504836b..9aa995be713d 100644 --- a/monkestation/code/modules/art_sci_overrides/artifact_effects/bomb.dm +++ b/monkestation/code/modules/art_sci_overrides/artifact_effects/bomb.dm @@ -97,7 +97,7 @@ /datum/artifact_effect/bomb/explosive/payload() if(!..()) return FALSE - explosion(our_artifact.holder, devast,heavy,light,light*1.5) + explosion(our_artifact.holder.loc, devast,heavy,light,light*1.5) on_destroy(src) /// DEVESTATING BOMB