cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

/obj/item/projectile --> /obj/projectile (#30411)

Browse Source 
* yers

* vars

* map changes

* some comments (clearly not stolen from items)

* fix component

* summary
This commit is contained in:
kyunkyunkyun
2025-11-12 10:23:20 +00:00
committed by GitHub
parent e92a45369a
commit f96b26b75a
169 changed files with 858 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/coffin.dm
+1 -1
View File
@@ -50,7 +50,7 @@
igniting = FALSE
return ITEM_INTERACT_COMPLETE
/obj/structure/closet/coffin/vampire/bullet_act(obj/item/projectile/P)
/obj/structure/closet/coffin/vampire/bullet_act(obj/projectile/P)
if(!P.immolate)
return ..()
fire_act()
code/game/objects/structures/holosigns.dm
+4 -4
View File
@@ -106,11 +106,11 @@
max_integrity = 10
allow_walk = FALSE
/obj/structure/holosign/barrier/cyborg/bullet_act(obj/item/projectile/P)
/obj/structure/holosign/barrier/cyborg/bullet_act(obj/projectile/P)
take_damage((P.damage / 5) , BRUTE, MELEE, 1) //Doesn't really matter what damage flag it is.
if(istype(P, /obj/item/projectile/energy/electrode))
if(istype(P, /obj/projectile/energy/electrode))
take_damage(10, BRUTE, MELEE, 1) //Tasers aren't harmful.
if(istype(P, /obj/item/projectile/beam/disabler))
if(istype(P, /obj/projectile/beam/disabler))
take_damage(5, BRUTE, MELEE, 1) //Disablers aren't harmful.
/obj/structure/holosign/barrier/cyborg/hacked
@@ -119,7 +119,7 @@
max_integrity = 20
var/shockcd = 0
/obj/structure/holosign/barrier/cyborg/hacked/bullet_act(obj/item/projectile/P)
/obj/structure/holosign/barrier/cyborg/hacked/bullet_act(obj/projectile/P)
take_damage(P.damage, BRUTE, MELEE, 1) //Yeah no this doesn't get projectile resistance.
/obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown()
code/game/objects/structures/lavaland/necropolis_tendril.dm
+1 -1
View File
@@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(tendrils)
. = ..()
SEND_SIGNAL(src, COMSIG_SPAWNER_SET_TARGET, user)
/obj/structure/spawner/lavaland/bullet_act(obj/item/projectile/P)
/obj/structure/spawner/lavaland/bullet_act(obj/projectile/P)
. = ..()
if(P.firer)
SEND_SIGNAL(src, COMSIG_SPAWNER_SET_TARGET, P.firer)
code/game/objects/structures/reflector.dm
+2 -2
View File
@@ -14,10 +14,10 @@
if(mapload)
anchored = TRUE
/obj/structure/reflector/bullet_act(obj/item/projectile/P)
/obj/structure/reflector/bullet_act(obj/projectile/P)
var/turf/reflector_turf = get_turf(src)
var/turf/reflect_turf
if(!istype(P, /obj/item/projectile/beam))
if(!istype(P, /obj/projectile/beam))
return ..()
var/new_dir = get_reflection(dir, P.dir)
if(new_dir && anchored)
code/game/objects/structures/statues.dm
+1 -1
View File
@@ -94,7 +94,7 @@
if(exposed_temperature > 300)
PlasmaBurn(exposed_temperature)
/obj/structure/statue/plasma/bullet_act(obj/item/projectile/P)
/obj/structure/statue/plasma/bullet_act(obj/projectile/P)
if(!QDELETED(src)) //wasn't deleted by the projectile's effects.
if(!P.nodamage && ((P.damage_type == BURN) || (P.damage_type == BRUTE)))
if(P.firer)
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -129,7 +129,7 @@
return
/obj/structure/table/CanPass(atom/movable/mover, border_dir)
if(istype(mover,/obj/item/projectile))
if(istype(mover,/obj/projectile))
return check_cover(mover, border_dir)
var/mob/living/living_mover = mover
@@ -163,7 +163,7 @@
* * P - The projectile trying to cross.
* * proj_dir - The incoming direction of the projectile.
*/
/obj/structure/table/proc/check_cover(obj/item/projectile/P, proj_dir)
/obj/structure/table/proc/check_cover(obj/projectile/P, proj_dir)
. = TRUE
if(!flipped)
return