cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +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/modules/power/engines/singularity/emitter.dm
+2 -2
View File
@@ -33,7 +33,7 @@
/// Locked by an ID card
var/locked = FALSE
var/projectile_type = /obj/item/projectile/beam/emitter/hitscan
var/projectile_type = /obj/projectile/beam/emitter/hitscan
var/projectile_sound = 'sound/weapons/emitter.ogg'
var/datum/effect_system/spark_spread/sparks
@@ -282,7 +282,7 @@
return FALSE
/obj/machinery/power/emitter/proc/fire_beam()
var/obj/item/projectile/P = new projectile_type(get_turf(src))
var/obj/projectile/P = new projectile_type(get_turf(src))
playsound(get_turf(src), projectile_sound, 50, TRUE)
if(prob(35))
sparks.start()
code/modules/power/engines/singularity/field_generator.dm
+1 -1
View File
@@ -180,7 +180,7 @@ field_generator energy level display
else
..()
/obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj)
/obj/machinery/field/generator/bullet_act(obj/projectile/Proj)
if(Proj.flag != BULLET && !Proj.nodamage)
energy = min(energy + Proj.damage, FIELD_GENERATOR_MAX_ENERGY)
check_energy_level()
code/modules/power/engines/singularity/singularity.dm
+1 -1
View File
@@ -129,7 +129,7 @@ GLOBAL_VAR_INIT(global_singulo_id, 1)
return
/obj/singularity/bullet_act(obj/item/projectile/P)
/obj/singularity/bullet_act(obj/projectile/P)
qdel(P)
return 0 //Will there be an impact? Who knows. Will we see it? No.
code/modules/power/engines/supermatter/supermatter.dm
+2 -2
View File
@@ -692,11 +692,11 @@
countdown()
return 1
/obj/machinery/atmospherics/supermatter_crystal/bullet_act(obj/item/projectile/proj)
/obj/machinery/atmospherics/supermatter_crystal/bullet_act(obj/projectile/proj)
var/turf/L = loc
if(!istype(L))
return FALSE
if(!istype(proj, /obj/item/projectile/beam/emitter/hitscan) && power_changes)
if(!istype(proj, /obj/projectile/beam/emitter/hitscan) && power_changes)
investigate_log("has been hit by [proj] fired by [key_name(proj.firer)]", INVESTIGATE_SUPERMATTER)
if(proj.flag != BULLET)
if(power_changes) //This needs to be here I swear