mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-03 05:21:27 +00:00
cca7f8ee4c
* Refactors firestacks into status effects (#66573) This PR refactors firestacks into two status effects: fire_stacks, which behave like normal firestacks you have right now, and wet_stacks, which are your negative fire stacks right now. This allows for custom fires with custom behaviors and icons to be made. Some fire related is moved away from species(what the fuck was it even doing there) into these as well. Oh and I fixed the bug where monkeys on fire had a human fire overlay, why wasn't this fixed already, it's like ancient. Also changed some related proc names to be snake_case like everything should be. This allows for custom fire types with custom behaviours, like freezing freon fire or radioactive tritium fire. Removing vars from living and moving them to status effects for modularity is also good. Nothing to argue about since there's nothing player-facing * Hud Image Culling By Z Level: Theft edition (#65189) * makes hud images only apply by z level * makes some of the atom_hud procs have better names * fixes warning with the hud_user list and adds better documentation * better docs for hud_images * removes TODOs * docs for hud_list * adds support for linked z levels so mobs can see lower ones * fixes merge conflict and shittily makes only shocked airlocks get added * adds support for setting images in the hud as active and inactive * gets rid of unatomic spatial grid change * maybe i should actually try COMPILING my changes * fixes merge skew and makes it compile again * fixes huds refusing to remove from users who changed z level * improves z level and registration logic * fixes antag huds not appearing * Fixes antag huds not properly setting. We now use hud_list in init, so it needs to be set before the new call, not after. Not sure why the use of appearance key was split like this, but none else knows either so none can stop me * Ensures that hiding a basic appearance also hides the atom's active list too * Fixes antag huds going poof Ensures that remove_atom_from_hud will return false if the passed atom isn't managed by it This fixes antag huds disappearing randomly, since they assumed that if the parent call of remove_atom_from_hud returned true, we should delete ourselves. This is a safe assumption for them to make, since they should only ever have one atom. Does kinda bork if we call remove_atom_from_hud in a way that is unsure if the passed atom is actually in that list. We were forced into doing this by how atom huds use the qdeleting signal. * makes basic alternate_appearance's only update themselves when setting their hud image to active and makes them not add themselves to the global huds_by_category list * fixes mistake with hud_users list being set non associatively (bad) * as anything in bot path loops * Fixes merge skew problems * Makes bot paths non global This way they can show themselves to only the bot that "owns" them, ya feel me? * Fixes huds not showing up sometimes, cleans up some code Post Kapu's limb refactor, we were calling prepare_huds twice in a human init call chain. What was happening was this: call prepare_huds() // Human I gained a new hud image I set active hud icons to mirror it call prepare_huds() // Living I overwrote the new hud image I attempted to set active hud icons, which failed because it assumes this can never happen *cries* * Renames add_hud_to_atom to show_to My hope is this will make understanding hud code a bit easier, by tying the behavior to a "verb" more closely. Also renamed a few vars * remove_hud_from_mob -> hide_from * Nitpicks a few comments * Whoops/fuck/shit/damn it all/hhhhhhhhhhhh * Moves check down, improves stack trace a bit Co-authored-by: KylerAce <kylerlumpkin1@gmail.com> * small touch-up * this should do it Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: KylerAce <kylerlumpkin1@gmail.com>
121 lines
3.2 KiB
Plaintext
121 lines
3.2 KiB
Plaintext
// 7.62x38mmR (Nagant Revolver)
|
|
|
|
/obj/projectile/bullet/n762
|
|
name = "7.62x38mmR bullet"
|
|
damage = 60
|
|
|
|
// .50AE (Desert Eagle)
|
|
|
|
/obj/projectile/bullet/a50ae
|
|
name = ".50AE bullet"
|
|
damage = 60
|
|
|
|
// .38 (Detective's Gun)
|
|
|
|
/obj/projectile/bullet/c38
|
|
name = ".38 bullet"
|
|
damage = 25
|
|
ricochets_max = 2
|
|
ricochet_chance = 50
|
|
ricochet_auto_aim_angle = 10
|
|
ricochet_auto_aim_range = 3
|
|
wound_bonus = -20
|
|
bare_wound_bonus = 10
|
|
embedding = list(embed_chance=25, fall_chance=2, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=1 SECONDS)
|
|
embed_falloff_tile = -4
|
|
|
|
/obj/projectile/bullet/c38/match
|
|
name = ".38 Match bullet"
|
|
ricochets_max = 4
|
|
ricochet_chance = 100
|
|
ricochet_auto_aim_angle = 40
|
|
ricochet_auto_aim_range = 5
|
|
ricochet_incidence_leeway = 50
|
|
ricochet_decay_chance = 1
|
|
ricochet_decay_damage = 1
|
|
|
|
/obj/projectile/bullet/c38/match/bouncy
|
|
name = ".38 Rubber bullet"
|
|
damage = 10
|
|
stamina = 30
|
|
weak_against_armour = TRUE
|
|
ricochets_max = 6
|
|
ricochet_incidence_leeway = 0
|
|
ricochet_chance = 130
|
|
ricochet_decay_damage = 0.8
|
|
shrapnel_type = null
|
|
sharpness = NONE
|
|
embedding = null
|
|
|
|
// premium .38 ammo from cargo, weak against armor, lower base damage, but excellent at embedding and causing slice wounds at close range
|
|
/obj/projectile/bullet/c38/dumdum
|
|
name = ".38 DumDum bullet"
|
|
damage = 15
|
|
weak_against_armour = TRUE
|
|
ricochets_max = 0
|
|
sharpness = SHARP_EDGED
|
|
wound_bonus = 20
|
|
bare_wound_bonus = 20
|
|
embedding = list(embed_chance=75, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=1 SECONDS)
|
|
wound_falloff_tile = -5
|
|
embed_falloff_tile = -15
|
|
|
|
/obj/projectile/bullet/c38/trac
|
|
name = ".38 TRAC bullet"
|
|
damage = 10
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
var/mob/living/carbon/M = target
|
|
if(!istype(M))
|
|
return
|
|
var/obj/item/implant/tracking/c38/imp
|
|
for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant
|
|
imp = TI
|
|
return
|
|
if(!imp)
|
|
imp = new /obj/item/implant/tracking/c38(M)
|
|
imp.implant(M)
|
|
|
|
/obj/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
|
|
name = ".38 Hot Shot bullet"
|
|
damage = 20
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/M = target
|
|
M.adjust_fire_stacks(6)
|
|
M.ignite_mob()
|
|
|
|
/obj/projectile/bullet/c38/iceblox //see /obj/projectile/temp for the original code
|
|
name = ".38 Iceblox bullet"
|
|
damage = 20
|
|
var/temperature = 100
|
|
ricochets_max = 0
|
|
|
|
/obj/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE)
|
|
. = ..()
|
|
if(isliving(target))
|
|
var/mob/living/M = target
|
|
M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
|
|
|
|
// .357 (Syndie Revolver)
|
|
|
|
/obj/projectile/bullet/a357
|
|
name = ".357 bullet"
|
|
damage = 60
|
|
wound_bonus = -30
|
|
|
|
// admin only really, for ocelot memes
|
|
/obj/projectile/bullet/a357/match
|
|
name = ".357 match bullet"
|
|
ricochets_max = 5
|
|
ricochet_chance = 140
|
|
ricochet_auto_aim_angle = 50
|
|
ricochet_auto_aim_range = 6
|
|
ricochet_incidence_leeway = 80
|
|
ricochet_decay_chance = 1
|