cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify spacepod weapon firing procs

Browse Source 
I REALLY FUCKING HATE BYOND
This commit is contained in:
Exxion
2015-03-04 15:50:48 -05:00
parent 5b3c256218
commit a278ce5c27
2 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
code/WorkInProgress/pomf/spacepods/equipment.dm
View File

@@ -7,7 +7,7 @@
var/turf/secondloc
if(!my_atom.equipment_system || !my_atom.equipment_system.weapon_system)
usr << "<span class='warning'>Missing equipment or weapons.</span>"
my_atom.verbs -= text2path("[type]/proc/fire_weapon_system")
my_atom.verbs -= /obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system
return
my_atom.battery.use(shot_cost)
var/olddir
@@ -73,6 +73,8 @@
var/shots_per = 1
var/fire_sound
var/fire_delay = 10
var/verb_name = "What the fuck?"
var/verb_desc = "How did you get this?"
/obj/item/device/spacepod_equipment/weaponry/taser
name = "\improper taser system"
@@ -81,14 +83,8 @@
projectile_type = /obj/item/projectile/energy/electrode
shot_cost = 10
fire_sound = "sound/weapons/Taser.ogg"
/obj/item/device/spacepod_equipment/weaponry/taser/proc/fire_weapon_system()
set category = "Spacepod"
set name = "Fire Taser System"
set desc = "Fire ze tasers!"
set src = usr.loc
var/obj/spacepod/S = src
S.equipment_system.weapon_system.fire_weapons()
verb_name = "Fire Taser System"
verb_desc = "Fire ze tasers!"
/obj/item/device/spacepod_equipment/weaponry/taser/burst
name = "\improper burst taser system"
@@ -96,14 +92,8 @@
icon_state = "pod_b_taser"
shot_cost = 20
shots_per = 3
/obj/item/device/spacepod_equipment/weaponry/taser/burst/proc/fire_weapons_system()
set category = "Spacepod"
set name = "Fire Burst Taser System"
set desc = "Fire ze tasers!"
set src = usr.loc
var/obj/spacepod/S = src
S.equipment_system.weapon_system.fire_weapons()
verb_name = "Fire Burst Taser System"
verb_desc = "Fire ze tasers!"
/obj/item/device/spacepod_equipment/weaponry/laser
name = "\improper laser system"
@@ -113,11 +103,14 @@
shot_cost = 15
fire_sound = 'sound/weapons/Laser.ogg'
fire_delay = 25
verb_name = "Fire Laser System"
verb_desc = "Fire ze lasers!"
/obj/item/device/spacepod_equipment/weaponry/laser/proc/fire_weapon_system()
set category = "Spacepod"
set name = "Fire Laser System"
set desc = "Fire ze lasers!"
set src = usr.loc
/obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system()
var/obj/spacepod/S = src
S.equipment_system.weapon_system.fire_weapons()
var/obj/item/device/spacepod_equipment/weaponry/SPE = S.equipment_system.weapon_system
set category = "Spacepod"
//set name = SPE.verb_name
//set desc = SPE.verb_desc
set src = usr.loc
SPE.fire_weapons()

8
code/WorkInProgress/pomf/spacepods/spacepods.dm
View File

@@ -141,9 +141,7 @@
W.loc = equipment_system
equipment_system.weapon_system = W
equipment_system.weapon_system.my_atom = src
var/path = text2path("[W.type]/proc/fire_weapon_system")
if(path)
verbs += path//obj/spacepod/proc/fire_weapons
new/obj/item/device/spacepod_equipment/weaponry/proc/fire_weapon_system(src, equipment_system.weapon_system.verb_name, equipment_system.weapon_system.verb_desc) //Yes, it has to be referenced like that. W.verb_name/desc doesn't compile.
return
@@ -151,7 +149,7 @@
if(!hatch_open)
return ..()
if(!equipment_system || !istype(equipment_system))
user << "<span class='warning'>The pod has no equpment datum, or is the wrong type, yell at pomf.</span>"
user << "<span class='warning'>The pod has no equipment datum, or is the wrong type, yell at pomf.</span>"
return
var/list/possible = list()
if(battery)
@@ -176,7 +174,7 @@
user << "<span class='notice'>You remove \the [SPE] from the equipment system.</span>"
SPE.my_atom = null
equipment_system.weapon_system = null
verbs -= text2path("[SPE.type]/proc/fire_weapon_system")
verbs -= typesof(/obj/item/device/spacepod_equipment/weaponry/proc)
else
user << "<span class='warning'>You need an open hand to do that.</span>"
/*