Skip to content

Commit

Permalink
Minor Layout Adjustment to Archaic Temple and Statue Component Bugfix (
Browse files Browse the repository at this point in the history
…#6019)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Makes Layout Adjustments to Archaic Temple POI.**
2. **Adds New Ranged Trap Subtype.**
3. **Adds Female Statue Side and Back Sprites.**
4. **Bugfixes Unobserved Actor Component.**

## Why It's Good For The Game

1. _Minor adjustments to the POI that I don't want to describe in the PR
due to their connection to the mechanics. Repair of the door icons,
minor housekeeping._
2. _Having the traps fire non-stop is a little unfun. Even if they can
be jammed, sometimes it's neat to give them a limited chain of blasts._
3. _The male had side and back sprites but the female didn't. I just
kinda tweaked the male to fit._
4. _It was discovered that Ghosts able to see a statue were counting as
observers for the unobserved actor component, effectively crippling the
statue._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Layout Changes to Archaic Temple
add: Adds New Launcher Trap Type
fix: Adds Sprites to Female Statue
fix: Fixes Bug in Unobserved Actor Component
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Captain277 authored Sep 26, 2023
1 parent 78888ef commit e2ba2b1
Show file tree
Hide file tree
Showing 14 changed files with 101 additions and 82 deletions.
4 changes: 2 additions & 2 deletions code/datums/components/unobserved_actor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@
view_size = world.view

// We aren't in darkness, loop for viewers.
for(var/mob/living/mob_target as anything in oviewers(my_turf, view_size)) // They probably cannot see us if we cannot see them... can they?
for(var/mob/living/mob_target in oviewers(my_turf, view_size)) // They probably cannot see us if we cannot see them... can they?
if(mob_target.client && !mob_target.is_blind() && !mob_target.silicon_privileges && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT))
return TRUE
for(var/obj/vehicle/vehicle_target in oview(my_turf, view_size))
for(var/mob/vehicle_mob_target as anything in vehicle_target.occupants)
for(var/mob/vehicle_mob_target in vehicle_target.occupants)
if(vehicle_mob_target.client && !vehicle_mob_target.is_blind() && !HAS_TRAIT(vehicle_mob_target, TRAIT_UNOBSERVANT))
return TRUE

Expand Down
11 changes: 10 additions & 1 deletion code/game/objects/effects/traps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,9 @@ Add those other swinging traps you mentioned above!
var/burst_delay = 2
var/initial_fire_delay = 5

var/ammo_count = 0
var/ammo_store = 0 //How many shots the trap has stored before it runs out. This seems to work out to the value + 1.

//This needs to check dirs, projectiles, accuracy, reload/recharge. It's kinda gonna suck. Consult Turret code.

/obj/effect/trap/launcher/Initialize(mapload)
Expand All @@ -342,6 +345,9 @@ Add those other swinging traps you mentioned above!
return
if(broken)
return
if(ammo_count)
if(src.shot_number > src.ammo_store)
return
if(((src.last_shot + src.fire_delay) <= world.time) && (!broken) && (src.tripped))

src.last_shot = world.time
Expand Down Expand Up @@ -377,7 +383,6 @@ Add those other swinging traps you mentioned above!
M.use(5)
Break()
to_chat(user, "<span class='notice'>You slip the rods into the firing mechanism, jamming it.</span>")
qdel(src)
else
to_chat(user, "<span class='warning'>You need five rods to jam the mechanism.</span>")

Expand Down Expand Up @@ -416,6 +421,10 @@ Add those other swinging traps you mentioned above!
projectile_type = /obj/projectile/magic/aoe/fireball
projectile_sound = 'sound/weapons/cannon.ogg'

/obj/effect/trap/launcher/fireball_aoe/finite //Finite variant
ammo_count = 1
ammo_store = 1

//Web Launcher
/obj/effect/trap/launcher/web
projectile_type = /obj/projectile/webball
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/shoes/boots.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@
/obj/item/clothing/shoes/boots/swat/para
name = "PARA boots"
desc = "PMD issued gloves, stamped with protective seals and spells."
icon_state = "para_ert_boots"
action_button_name = "Enable Boot Sigils"

var/blessed = FALSE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@
icon_state = "human_female"
gender = NEUTER



//# Mob AI Code.

/datum/ai_holder/simple_mob/statue
Expand All @@ -66,8 +64,6 @@
speak_chance = 0
wander = FALSE



//# Mob Code.

/mob/living/simple_mob/living_statue/Initialize(mapload)
Expand Down
Binary file modified icons/mob/clothing/back.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/hands.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/backpack.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/shoes.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/statue.dmi
Binary file not shown.
Loading

0 comments on commit e2ba2b1

Please sign in to comment.