Skip to content

Commit

Permalink
more blugfixes (#4612)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
ThePooba authored Dec 19, 2024
1 parent 46152ac commit f0e7872
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 12 deletions.
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions code/game/objects/items/gift.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions code/modules/holiday/holidays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions monkestation/code/game/objects/items/implants/hardlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f0e7872

Please sign in to comment.