cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repathed /obj/item/projectile to /obj/projectile (#19693)

Browse Source 
Repathed /obj/item/projectile to /obj/projectile, same as TG and Bay,
that's pretty much it.
This commit is contained in:
Fluffy
2024-07-27 10:09:46 +00:00
committed by GitHub
parent 2a8d6acd86
commit 3e1b9d4170
214 changed files with 1014 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/cans.dm
+1 -1
View File
@@ -208,7 +208,7 @@
else
desc = initial(desc)
/obj/item/reagent_containers/food/drinks/cans/bullet_act(obj/item/projectile/P)
/obj/item/reagent_containers/food/drinks/cans/bullet_act(obj/projectile/P)
if(P.firer && REAGENT_VOLUME(reagents, /singleton/reagent/fuel) >= LETHAL_FUEL_CAPACITY)
visible_message(SPAN_DANGER("\The [name] is hit by the [P]!"))
log_and_message_admins("shot an improvised [name] explosive", P.firer)
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
+5 -6
View File
@@ -434,24 +434,23 @@
update_icon()
make_froth(offset_x = 0, offset_y = sabraged ? 13 : 15, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed
///Type of cork to fire away
var/obj/item/projectile/bullet/cork_to_fire = sabraged ? /obj/item/projectile/bullet/champagne_cork/sabrage : /obj/item/projectile/bullet/champagne_cork
var/obj/projectile/bullet/cork_to_fire = sabraged ? /obj/projectile/bullet/champagne_cork/sabrage : /obj/projectile/bullet/champagne_cork
///Our resulting cork projectile
var/obj/item/projectile/bullet/champagne_cork/popped_cork = new cork_to_fire(get_turf(src))
var/obj/projectile/bullet/champagne_cork/popped_cork = new cork_to_fire(get_turf(src))
popped_cork.firer = user
popped_cork.fire(dir2angle(user.dir) + rand(-30, 30))
/obj/item/projectile/bullet/champagne_cork
/obj/projectile/bullet/champagne_cork
name = "champagne cork"
icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi'
icon_state = "champagne_cork"
hitsound = 'sound/weapons/genhit.ogg'
damage = 5
embed = FALSE
sharp = FALSE
agony = 10 // ow!
var/drop_type = /obj/item/trash/champagne_cork
/obj/item/projectile/bullet/champagne_cork/on_impact(var/atom/A)
/obj/projectile/bullet/champagne_cork/on_impact(var/atom/A)
..()
new drop_type(src.loc) //always use src.loc so that ash doesn't end up inside windows
@@ -460,7 +459,7 @@
icon = 'icons/obj/item/reagent_containers/food/drinks/bottle.dmi'
icon_state = "champagne_cork"
/obj/item/projectile/bullet/champagne_cork/sabrage
/obj/projectile/bullet/champagne_cork/sabrage
icon_state = "champagne_cork_sabrage"
drop_type = /obj/item/trash/champagne_cork/sabrage
code/modules/reagents/reagent_dispenser.dm
+4 -4
View File
@@ -194,13 +194,13 @@
src.defuse = 0
message_admins("[key_name_admin(user)] <font color=#FF0000>reset</font> fuse on fueltank at ([loc.x],[loc.y],[loc.z]).")
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/projectile/Proj)
if(Proj.get_structure_damage())
if(istype(Proj.firer))
log_and_message_admins("shot a welding tank", Proj.firer)
log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).")
if(!istype(Proj ,/obj/item/projectile/beam/laser_tag) && !istype(Proj ,/obj/item/projectile/beam/practice) && !istype(Proj ,/obj/item/projectile/kinetic))
if(!istype(Proj ,/obj/projectile/beam/laser_tag) && !istype(Proj ,/obj/projectile/beam/practice) && !istype(Proj ,/obj/projectile/kinetic))
ex_act(2.0)
/obj/structure/reagent_dispensers/fueltank/ex_act(var/severity = 3.0)
@@ -396,7 +396,7 @@
capacity = 5000
reagents_to_add = list(/singleton/reagent/nutriment/triglyceride/oil/corn = 5000)
/obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/projectile/Proj)
if(Proj.get_structure_damage())
ex_act(2.0)
@@ -409,7 +409,7 @@
amount_per_transfer_from_this = 10
reagents_to_add = list(/singleton/reagent/coolant = 1000)
/obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/item/projectile/Proj)
/obj/structure/reagent_dispensers/coolanttank/bullet_act(var/obj/projectile/Proj)
if(Proj.get_structure_damage())
if (Proj.damage_type != DAMAGE_PAIN)
explode()