Skip to content

Commit

Permalink
prevents harmless guns from harming you. + lodge fix (#4928)
Browse files Browse the repository at this point in the history
* prevents harmless guns from harming you.

Finally figured this one out. Prevents cap guns and cham guns from letting you commit suicide.

* Update _Nadezhda_areas.dm

fixes #4901 by defining the lodge as is_maintenance = false (its parant was set to true)
  • Loading branch information
benj8560 authored Jan 13, 2024
1 parent 742f00f commit 07d2f94
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
22 changes: 22 additions & 0 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,28 @@ For the sake of consistency, I suggest always rounding up on even values when ap
mouthshoot = FALSE
return

if (istype(in_chamber))
user.visible_message(SPAN_WARNING("[user] pulls the trigger."))
if(silenced)
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 60, 1)
if(istype(in_chamber, /obj/item/projectile/bullet/cap))
user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy."))
mouthshoot = FALSE
return

if (istype(in_chamber))
user.visible_message(SPAN_WARNING("[user] pulls the trigger."))
if(silenced)
playsound(user, fire_sound, 10, 1)
else
playsound(user, fire_sound, 60, 1)
if(istype(in_chamber, /obj/item/projectile/chameleon))
user.show_message(SPAN_WARNING("The gun fired but...you feel fine?"))
mouthshoot = FALSE
return

in_chamber.on_hit(M)
if (!in_chamber.is_halloss())
log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
Expand Down
2 changes: 2 additions & 0 deletions maps/__Nadezhda/area/_Nadezhda_areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,13 @@
/area/nadezhda/outside/forest/hunting_lodge
name = "Hunting Lodge"
icon_state = "forest"
is_maintenance = FALSE
is_dungeon_lootable = FALSE

/area/nadezhda/outside/forest/hunting_lodge_dark
name = "Hunting Lodge"
icon_state = "erisblue"
is_maintenance = FALSE
dynamic_lighting = TRUE
is_dungeon_lootable = FALSE

Expand Down

0 comments on commit 07d2f94

Please sign in to comment.