Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: gem drop for other fauna and second tail on explorer suit. #4002

Merged
merged 6 commits into from
Dec 12, 2023
Merged

bugfix: gem drop for other fauna and second tail on explorer suit. #4002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1164f0
Done.
Daeberdir Dec 3, 2023
b36b354
ahem
Daeberdir Dec 3, 2023
95b7a38
AHEM
Daeberdir Dec 3, 2023
cb88dcb
peredumal
Daeberdir Dec 4, 2023
4e5dc21
Merge remote-tracking branch 'upstream/master220' into zoozya-1
Daeberdir Dec 6, 2023
264a9fa
Done.
Daeberdir Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/modules/clothing/clothing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,11 @@ BLIND // can't see anything
if(user.dna.species.name in hide_tail_by_species)
if(!(flags_inv & HIDETAIL)) //Hide the tail if the user's species is in the hide_tail_by_species list and the tail isn't already hidden.
flags_inv |= HIDETAIL
user.update_tail_layer()
else
if(!(initial(flags_inv) & HIDETAIL) && (flags_inv & HIDETAIL)) //Otherwise, remove the HIDETAIL flag if it wasn't already in the flags_inv to start with.
flags_inv &= ~HIDETAIL
user.update_tail_layer()

/obj/item/clothing/suit/ui_action_click(mob/user) //This is what happens when you click the HUD action button to adjust your suit.
if(!ignore_suitadjust)
Expand Down
10 changes: 0 additions & 10 deletions code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,6 @@
crusher_loot = /obj/item/crusher_trophy/watcher_wing
loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1)
var/jewelry_loot = null

/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/death(gibbed)
if(!fromtendril && jewelry_loot)
if(prob(30))
var/obj/gem = new jewelry_loot(loc)
deathmessage = "spits out a [gem.name] as it dies!"
jewelry_loot = null
. = ..()
deathmessage = initial(deathmessage)

/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/magmawing
name = "magmawing watcher"
Expand Down
7 changes: 1 addition & 6 deletions code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
search_objects = 1
wanted_objects = list(/obj/item/stack/ore/diamond, /obj/item/stack/ore/gold, /obj/item/stack/ore/silver,
/obj/item/stack/ore/uranium, /obj/item/stack/ore/titanium)

jewelry_loot = /obj/item/gem/rupee
var/chase_time = 100
var/will_burrow = TRUE
var/max_loot = 15 // The maximum amount of ore that can be stored in this thing's gut
Expand Down Expand Up @@ -82,8 +82,3 @@
/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(amount, updating_health = TRUE)
vision_range = 9
. = ..()

/mob/living/simple_animal/hostile/asteroid/goldgrub/death(gibbed)
if(prob(40))
new /obj/item/gem/rupee(loc)
. = ..()
12 changes: 11 additions & 1 deletion code/modules/mob/living/simple_animal/hostile/mining/mining.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
response_harm = "strikes"
status_flags = 0
a_intent = INTENT_HARM
var/jewelry_loot
var/crusher_loot
var/throw_message = "bounces off of"
var/fromtendril = FALSE
Expand Down Expand Up @@ -57,7 +58,16 @@
var/datum/status_effect/crusher_damage/C = has_status_effect(STATUS_EFFECT_CRUSHERDAMAGETRACKING)
if(C && crusher_loot && prob((C.total_damage/maxHealth) * crusher_drop_mod)) //on average, you'll need to kill 4 creatures before getting the item
spawn_crusher_loot()
..(gibbed)
if(!fromtendril && jewelry_loot)
if(prob(melee_damage_lower | melee_damage_upper ? 30 : 40)) // Poaching logic - a better reward gained from hunting harmless animals.
var/obj/gem = new jewelry_loot(loc)
if(!deathmessage)
deathmessage = "spits out a [gem.name] as it dies!"
jewelry_loot = null
. = ..(gibbed)
deathmessage = initial(deathmessage)
else
..(gibbed)

/mob/living/simple_animal/hostile/asteroid/proc/spawn_crusher_loot()
butcher_results[crusher_loot] = 1
Loading