mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-14 03:21:53 +00:00
e6f99049f6
* MILLA phase 2 * Lint. * Build Rust library * Assorted bugfixes and tweaks * Simplify fire mechanics and make hotspot sending to DM more reliable. * Assorted tweaks, fixed an issue in the core engine and removed the softcap it made necesary. * SM fixes, slower plasmafire, less overpowered pyro anomalies, and air alarm improvements. * Review fixes. * Build Rust library * Unbalanced icon. * Rebalance immovable rods. * Unbalanced has alerts, can fight airflow (but get slowed) * Build Rust library * Stronger space cooling, slower temperature flow, faster burns, burnt floors, and a hotspot display fix. * Build Rust library * Tweaks to avoid merge conflict * Oops. * Build Rust library * Rebalance wind. * Rebalance temperature flow and space cooling. * Fix gas flamethrower. * Build Rust library * Make air push slowdown directional, so you don't get slowed while moving with the air. * Variable name cleanup. * Reduce the speed of wind pushes. * Prevent wind pushes from breaking your pull. * Prevent swaps during wind push. * Made supermatter crytals reliably run last in atmos machinery. * Sped up plasmafire burning, but dropped the minimum burn amount. * Rebalanced SM heat output. * Rebalanced pyro anomaly. * Build Rust library * Lint * Build Rust library * Uncap fuel burnt readout. * Added Custom air alarm mode, dropped Refill cap to ONE_ATMOSPHERE. * Updated air alarm modes to use pressure settings instead of ONE_ATMOSPHERE * Added a list of areas not in Filtering to atmos alert computer. * Increase pressure gradient and vent output, especially at low distro pressure. * Changed Immovable Rod from Moderate to Major. * Lint * Build Rust library * More lint! * Build Rust library * Magboots, scaled slowdown, and nukie borg immunity * Wind image * Wind v2 * Wind v3 * pngcrush * pngcrush again * Moved hotspot removal into SSair, add wind effect. * Lint * Build Rust library * Fix hotspots. * Hotspot visual based on gas burnt * Build Rust library * Scaled wind to gas amount, stopped first wind push while moving. * Made Rust panic logging safer. * Made MILLA full tick and sleep timers more honest. * Pressure overlay, ghost mode, atmos goggles. * Build Rust library * Lint * Build Rust library * More lint-y stuff. * Build Rust library * Repair pressure overlay if it loses its loc. * Bind pressure overlays to their tile better. * Build Rust library * Make the pressure overlay work on z=1 and not proliferate effects. * Don't block the supply shuttle. * Don't fine for special effects. * Maybe don't fine for ghosts, either. * Build Rust library * Make pressure overlay play nice with shuttles. * Build Rust library * Pressure scanning for borgs. * Build Rust library * Lint * Build Rust library * Made explosions not generate so much wind. * Removed an old and non-functional proc. * Clientless mobs can get pushed again. * Build Rust library * cargo fmt * Build Rust library * Don't divide by zero. * Plasmafire generator for the Shadow * Update shadow to use plasmafire generators * Fix shadow's plasmafire generators going out on depart. * Prevent heat2color from runtiming at absolute zero. * Better nanofrost * Build Rust library * Singularity immunity * Build Rust library * Add back meson mode to atmospheric scanner goggles, so they don't stare deeply into the SM * Build Rust library * Dump panic outputs into data/ instead. * Build Rust library * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> * Saner handling of MILLA crash. * Build Rust library --------- Signed-off-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
318 lines
8.3 KiB
Plaintext
318 lines
8.3 KiB
Plaintext
/obj/item/projectile/bullet
|
|
name = "bullet"
|
|
icon_state = "bullet"
|
|
damage = 60
|
|
damage_type = BRUTE
|
|
flag = "bullet"
|
|
hitsound_wall = "ricochet"
|
|
impact_effect_type = /obj/effect/temp_visual/impact_effect
|
|
|
|
/// beanbag, heavy stamina damage
|
|
/obj/item/projectile/bullet/weakbullet
|
|
name = "beanbag slug"
|
|
damage = 5
|
|
stamina = 40
|
|
|
|
/obj/item/projectile/bullet/weakbullet/on_hit(atom/target, blocked = 0)
|
|
. = ..()
|
|
if(isliving(target))
|
|
var/mob/living/L = target
|
|
if(L.move_resist < INFINITY)
|
|
var/atom/throw_target = get_edge_target_turf(L, get_dir(src, get_step_away(L, starting)))
|
|
L.throw_at(throw_target, 1, 2)
|
|
|
|
/obj/item/projectile/bullet/weakbullet/booze
|
|
|
|
/obj/item/projectile/bullet/weakbullet/booze/on_hit(atom/target, blocked = 0)
|
|
if(..(target, blocked))
|
|
var/mob/living/M = target
|
|
M.AdjustDizzy(40 SECONDS)
|
|
M.AdjustSlur(40 SECONDS)
|
|
M.AdjustConfused(40 SECONDS)
|
|
M.AdjustEyeBlurry(40 SECONDS)
|
|
M.AdjustDrowsy(40 SECONDS)
|
|
for(var/datum/reagent/consumable/ethanol/A in M.reagents.reagent_list)
|
|
M.AdjustParalysis(4 SECONDS)
|
|
M.AdjustDizzy(20 SECONDS)
|
|
M.AdjustSlur(20 SECONDS)
|
|
M.AdjustConfused(20 SECONDS)
|
|
M.AdjustEyeBlurry(20 SECONDS)
|
|
M.AdjustDrowsy(20 SECONDS)
|
|
A.volume += 5 //Because we can
|
|
|
|
/obj/item/projectile/bullet/weakbullet2
|
|
name = "rubber bullet"
|
|
damage = 5
|
|
stamina = 35
|
|
icon_state = "bullet-r"
|
|
|
|
/obj/item/projectile/bullet/weakbullet3
|
|
damage = 20
|
|
|
|
/obj/item/projectile/bullet/weakbullet4
|
|
name = "rubber bullet"
|
|
damage = 5
|
|
stamina = 30
|
|
icon_state = "bullet-r"
|
|
|
|
/obj/item/projectile/bullet/toxinbullet
|
|
damage = 15
|
|
damage_type = TOX
|
|
|
|
/obj/item/projectile/bullet/incendiary
|
|
immolate = 1
|
|
|
|
/obj/item/projectile/bullet/incendiary/firebullet
|
|
damage = 10
|
|
|
|
/obj/item/projectile/bullet/armourpiercing
|
|
damage = 17
|
|
armour_penetration_flat = 10
|
|
|
|
/obj/item/projectile/bullet/armourpiercing/wt550
|
|
damage = 15
|
|
armour_penetration_percentage = 50
|
|
armour_penetration_flat = 25
|
|
|
|
/obj/item/projectile/bullet/pellet
|
|
name = "pellet"
|
|
damage = 12.5
|
|
tile_dropoff = 0.75
|
|
tile_dropoff_s = 1.25
|
|
armour_penetration_flat = -20
|
|
|
|
/obj/item/projectile/bullet/pellet/rubber
|
|
name = "rubber pellet"
|
|
damage = 3
|
|
stamina = 12.5
|
|
icon_state = "bullet-r"
|
|
armour_penetration_flat = -10
|
|
|
|
/obj/item/projectile/bullet/pellet/rubber/on_hit(atom/target, blocked = 0)
|
|
. = ..()
|
|
if(!ishuman(target))
|
|
return
|
|
var/mob/living/carbon/human/H = target
|
|
// initial range - range gives approximate tile distance from user
|
|
if(initial(range) - range <= 5 && H.getStaminaLoss() >= 60)
|
|
H.KnockDown(8 SECONDS)
|
|
|
|
/obj/item/projectile/bullet/pellet/assassination
|
|
damage = 12
|
|
tile_dropoff = 1 // slightly less damage and greater damage falloff compared to normal buckshot
|
|
|
|
/obj/item/projectile/bullet/pellet/assassination/on_hit(atom/target, blocked = 0)
|
|
if(..(target, blocked))
|
|
var/mob/living/M = target
|
|
M.AdjustSilence(4 SECONDS) // HELP MIME KILLING ME IN MAINT
|
|
|
|
/obj/item/projectile/bullet/midbullet
|
|
damage = 20
|
|
stamina = 45 // Three rounds from the c20r knocks unarmoured people down, four for people with bulletproof
|
|
|
|
/obj/item/projectile/bullet/midbullet_r
|
|
damage = 5
|
|
stamina = 75 //Still two rounds to knock people down
|
|
|
|
/obj/item/projectile/bullet/midbullet2
|
|
damage = 25
|
|
|
|
/obj/item/projectile/bullet/midbullet3
|
|
damage = 30
|
|
|
|
/obj/item/projectile/bullet/midbullet3/hp
|
|
damage = 40
|
|
armour_penetration_flat = -40
|
|
|
|
/obj/item/projectile/bullet/midbullet3/ap
|
|
damage = 27
|
|
armour_penetration_flat = 40
|
|
|
|
/obj/item/projectile/bullet/midbullet3/fire
|
|
immolate = 1
|
|
|
|
/obj/item/projectile/bullet/midbullet3/overgrown
|
|
icon = 'icons/obj/ammo.dmi'
|
|
item_state = "peashooter_bullet"
|
|
icon_state = "peashooter_bullet"
|
|
damage = 25
|
|
|
|
/obj/item/projectile/bullet/midbullet3/overgrown/prehit(atom/target)
|
|
if(HAS_TRAIT(target, TRAIT_I_WANT_BRAINS))
|
|
damage += 10
|
|
return ..()
|
|
|
|
/obj/item/projectile/bullet/heavybullet
|
|
damage = 35
|
|
|
|
/// taser slugs for shotguns, nothing special
|
|
/obj/item/projectile/bullet/stunshot
|
|
name = "stunshot"
|
|
damage = 5
|
|
weaken = 10 SECONDS
|
|
stutter = 10 SECONDS
|
|
jitter = 40 SECONDS
|
|
range = 7
|
|
icon_state = "spark"
|
|
color = "#FFFF00"
|
|
|
|
/obj/item/projectile/bullet/incendiary/shell
|
|
name = "incendiary slug"
|
|
damage = 20
|
|
|
|
/obj/item/projectile/bullet/incendiary/shell/Move()
|
|
..()
|
|
var/turf/location = get_turf(src)
|
|
if(location)
|
|
var/obj/effect/hotspot/hotspot = new /obj/effect/hotspot/fake(location)
|
|
hotspot.temperature = 1000
|
|
hotspot.recolor()
|
|
location.hotspot_expose(700, 50)
|
|
|
|
/obj/item/projectile/bullet/incendiary/shell/dragonsbreath
|
|
name = "dragonsbreath round"
|
|
damage = 5
|
|
|
|
/obj/item/projectile/bullet/meteorshot
|
|
name = "meteor"
|
|
icon = 'icons/obj/meteor.dmi'
|
|
icon_state = "dust"
|
|
damage = 30
|
|
knockdown = 8 SECONDS
|
|
hitsound = 'sound/effects/meteorimpact.ogg'
|
|
|
|
/obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0)
|
|
..()
|
|
if(ismovable(target))
|
|
var/atom/movable/M = target
|
|
if(M.move_resist < INFINITY)
|
|
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
|
|
M.throw_at(throw_target, 3, 2)
|
|
|
|
/obj/item/projectile/bullet/meteorshot/New()
|
|
..()
|
|
SpinAnimation()
|
|
|
|
/obj/item/projectile/bullet/mime
|
|
damage = 40
|
|
var/special_effects = TRUE
|
|
|
|
/obj/item/projectile/bullet/mime/on_hit(atom/target, blocked = 0)
|
|
..(target, blocked)
|
|
if(special_effects)
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/M = target
|
|
M.Silence(20 SECONDS)
|
|
else if(istype(target, /obj/mecha/combat/honker))
|
|
var/obj/mecha/chassis = target
|
|
chassis.occupant_message("A mimetech anti-honk bullet has hit \the [chassis]!")
|
|
chassis.use_power(chassis.get_charge() / 2)
|
|
for(var/obj/item/mecha_parts/mecha_equipment/weapon/honker in chassis.equipment)
|
|
honker.set_ready_state(0)
|
|
|
|
/obj/item/projectile/bullet/mime/nonlethal
|
|
damage = 0 /// We deal no normal damage...
|
|
stamina = 40 /// ...Rather a large amount of stamina damage. Used in the mime mecha
|
|
|
|
/obj/item/projectile/bullet/mime/fake
|
|
damage = 0
|
|
nodamage = TRUE
|
|
special_effects = FALSE
|
|
log_override = TRUE
|
|
|
|
/obj/item/projectile/bullet/dart
|
|
name = "dart"
|
|
icon_state = "cbbolt"
|
|
damage = 6
|
|
var/penetrate_thick = FALSE
|
|
|
|
/obj/item/projectile/bullet/dart/New()
|
|
..()
|
|
create_reagents(50)
|
|
reagents.set_reacting(FALSE)
|
|
|
|
/obj/item/projectile/bullet/dart/on_hit(atom/target, blocked = 0, hit_zone)
|
|
if(iscarbon(target))
|
|
var/mob/living/carbon/M = target
|
|
if(blocked != INFINITY)
|
|
if(M.can_inject(null, FALSE, hit_zone, penetrate_thick)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
|
|
..()
|
|
|
|
reagents.reaction(M, REAGENT_INGEST, 0.1)
|
|
reagents.trans_to(M, reagents.total_volume)
|
|
return TRUE
|
|
else
|
|
blocked = INFINITY
|
|
target.visible_message("<span class='danger'>[src] was deflected!</span>", \
|
|
"<span class='userdanger'>You were protected against [src]!</span>")
|
|
..(target, blocked, hit_zone)
|
|
reagents.set_reacting(TRUE)
|
|
reagents.handle_reactions()
|
|
return TRUE
|
|
|
|
/obj/item/projectile/bullet/dart/metalfoam
|
|
|
|
/obj/item/projectile/bullet/dart/metalfoam/New()
|
|
..()
|
|
reagents.add_reagent("aluminum", 15)
|
|
reagents.add_reagent("fluorosurfactant", 5)
|
|
reagents.add_reagent("sacid", 5)
|
|
|
|
//This one is for future syringe guns update
|
|
/obj/item/projectile/bullet/dart/syringe
|
|
name = "syringe"
|
|
icon = 'icons/obj/chemical.dmi'
|
|
icon_state = "syringeproj"
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/heavyduty
|
|
damage = 20
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/pierce_ignore
|
|
penetrate_thick = TRUE
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/tranquilizer
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/tranquilizer/New()
|
|
..()
|
|
reagents.add_reagent("haloperidol", 15)
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/holy
|
|
|
|
/obj/item/projectile/bullet/dart/syringe/holy/New()
|
|
..()
|
|
reagents.add_reagent("holywater", 10)
|
|
|
|
/obj/item/projectile/bullet/neurotoxin
|
|
name = "neurotoxin spit"
|
|
icon_state = "neurotoxin"
|
|
damage = 5
|
|
damage_type = TOX
|
|
stamina = 40
|
|
knockdown = 10 SECONDS
|
|
|
|
/obj/item/projectile/bullet/neurotoxin/on_hit(atom/target, blocked = 0)
|
|
if(isalien(target))
|
|
knockdown = 0
|
|
nodamage = TRUE
|
|
. = ..() // Execute the rest of the code.
|
|
|
|
/obj/item/projectile/bullet/anti_alien_toxin
|
|
name = "neurotoxin spit"
|
|
icon_state = "neurotoxin"
|
|
damage = 15 // FRENDLY FIRE FRENDLY FIRE
|
|
damage_type = BURN
|
|
|
|
/obj/item/projectile/bullet/anti_alien_toxin/on_hit(atom/target, blocked = 0)
|
|
if(isalien(target))
|
|
stun = 10 SECONDS
|
|
. = ..()
|
|
|
|
/obj/item/projectile/bullet/cap
|
|
name = "cap"
|
|
damage = 0
|
|
nodamage = 1
|
|
|
|
/obj/item/projectile/bullet/cap/fire()
|
|
loc = null
|
|
qdel(src)
|