cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 01:18:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Exosuit Cleaner (#11270)

Browse Source
This commit is contained in:
Geeves
2021-02-24 15:22:45 +02:00
committed by GitHub
parent ad4831cb77
commit bb5e8f577c
5 changed files with 51 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/heavy_vehicle/equipment/combat.dm
+19 -63
View File
@@ -106,7 +106,7 @@
name = "flashbang launcher"
desc = "The SGL-6FL grenade launcher is designated to launch primed flashbangs."
icon_state = "mech_gl"
holding_type = /obj/item/gun/launcher/mech/mountedfl
holding_type = /obj/item/gun/launcher/mech/mountedgl/fl
restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
restricted_software = list(MECH_SOFTWARE_WEAPONS)
@@ -114,7 +114,7 @@
name = "teargas launcher"
desc = "The SGL-6TGL grenade launcher is designated to launch primed teargas grenades."
icon_state = "mech_gl"
holding_type = /obj/item/gun/launcher/mech/mountedtgl
holding_type = /obj/item/gun/launcher/mech/mountedgl/tg
restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
restricted_software = list(MECH_SOFTWARE_WEAPONS)
@@ -122,7 +122,7 @@
name = "smoke grenade launcher"
desc = "The SGL-6SGL grenade launcher is designated to launch primed smoke grenades."
icon_state = "mech_gl"
holding_type = /obj/item/gun/launcher/mech/mountedsgl
holding_type = /obj/item/gun/launcher/mech/mountedgl/sm
restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
restricted_software = list(MECH_SOFTWARE_WEAPONS)
@@ -189,6 +189,8 @@
item_state = "smg"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
var/grenade_type = /obj/item/grenade/frag
release_force = 5
throw_distance = 7
proj = 5
@@ -197,83 +199,37 @@
/obj/item/gun/launcher/mech/mountedgl/consume_next_projectile()
if(proj < 1) return null
var/obj/item/grenade/frag/g = new (src)
if(proj < 1)
return null
var/obj/item/grenade/g = new grenade_type(src)
g.det_time = 10
g.activate(null)
proj--
addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
return g
/obj/item/gun/launcher/mech/mountedfl
name = "mounted grenade launcher"
/obj/item/gun/launcher/mech/mountedgl/fl
desc = "The SGL-6FL grenade launcher is designated to launch primed flashbangs."
icon = 'icons/obj/robot_items.dmi'
icon_state = "smg"
item_state = "smg"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
release_force = 5
throw_distance = 7
proj = 5
max_proj = 5
grenade_type = /obj/item/grenade/flashbang
proj_gen_time = 200
/obj/item/gun/launcher/mech/mountedfl/consume_next_projectile()
if(proj < 1) return null
var/obj/item/grenade/flashbang/g = new (src)
g.det_time = 10
g.activate(null)
proj--
addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
return g
/obj/item/gun/launcher/mech/mountedtgl
/obj/item/gun/launcher/mech/mountedgl/tg
name = "mounted teargas launcher"
desc = "The SGL-6TGL grenade launcher is designated to launch primed teargas grenades."
icon = 'icons/obj/robot_items.dmi'
icon_state = "smg"
item_state = "smg"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
release_force = 5
throw_distance = 7
proj = 3
max_proj = 3
grenade_type = /obj/item/grenade/chem_grenade/teargas
proj_gen_time = 200
/obj/item/gun/launcher/mech/mountedtgl/consume_next_projectile()
if(proj < 1) return null
var/obj/item/grenade/chem_grenade/teargas/tg = new (src)
tg.det_time = 10
tg.activate(null)
proj--
addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
return tg
/obj/item/gun/launcher/mech/mountedsgl
/obj/item/gun/launcher/mech/mountedgl/sm
name = "mounted smoke launcher"
desc = "The SGL-6SGL grenade launcher is designated to launch primed smoke grenades."
icon = 'icons/obj/robot_items.dmi'
icon_state = "smg"
item_state = "smg"
fire_sound = 'sound/weapons/grenadelaunch.ogg'
release_force = 5
throw_distance = 7
proj = 3
max_proj = 3
grenade_type = /obj/item/grenade/smokebomb
proj_gen_time = 200
/obj/item/gun/launcher/mech/mountedsgl/consume_next_projectile()
if(proj < 1) return null
var/obj/item/grenade/smokebomb/sg = new (src)
sg.det_time = 10
sg.activate(null)
proj--
addtimer(CALLBACK(src, .proc/regen_proj), proj_gen_time, TIMER_UNIQUE)
return sg
/obj/item/gun/launcher/mech/mountedgl/cl
name = "mounted cleaner launcher"
desc = "The SGL-6CL grenade launcher is designed to launch primed cleaner grenades."
grenade_type = /obj/item/grenade/chem_grenade/cleaner
proj_gen_time = 200
/obj/item/gun/launcher/mech/get_hardpoint_maptext()
return "[proj]/[max_proj]"
code/modules/heavy_vehicle/equipment/utility.dm
+10 -1
View File
@@ -645,4 +645,13 @@
return
/obj/item/mecha_equipment/quick_enter/attack_self()
return
return
/obj/item/mecha_equipment/mounted_system/grenadecleaner
name = "cleaner grenade launcher"
desc = "The SGL-6CL grenade launcher is designed to launch primed cleaner grenades."
icon_state = "mech_gl"
holding_type = /obj/item/gun/launcher/mech/mountedgl/cl
restricted_hardpoints = list(HARDPOINT_LEFT_SHOULDER, HARDPOINT_RIGHT_SHOULDER)
restricted_software = list(MECH_SOFTWARE_UTILITY)
code/modules/heavy_vehicle/premade/powerloader.dm
+10
View File
@@ -18,6 +18,16 @@
/mob/living/heavy_vehicle/premade/ripley/cargo
h_back = /obj/item/mecha_equipment/autolathe
/mob/living/heavy_vehicle/premade/ripley/janitorial
name = "janitorial power loader"
desc = "A standard cargo-handling power loader converted into a cleaning machine."
e_color = COLOR_PURPLE
h_l_hand = /obj/item/mecha_equipment/clamp
h_l_shoulder = /obj/item/mecha_equipment/mounted_system/grenadecleaner
h_r_shoulder = /obj/item/mecha_equipment/mounted_system/grenadecleaner
h_back = /obj/item/mecha_equipment/quick_enter
/obj/item/mech_component/manipulators/ripley
name = "exosuit arms"
exosuit_desc_string = "heavy-duty industrial lifters"
code/modules/research/designs/mechfab/mechs/designs_exosuit_equipment.dm
+6
View File
@@ -78,6 +78,12 @@
build_path = /obj/item/mecha_equipment/mounted_system/grenadeflash
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GOLD = 6000, MATERIAL_PHORON = 6000)
/datum/design/item/mechfab/exosuit_equipment/cleaner
name = "Mounted Cleaner Grenade Launcher"
req_tech = list(TECH_MATERIAL = 2)
build_path = /obj/item/mecha_equipment/mounted_system/grenadecleaner
materials = list(DEFAULT_WALL_MATERIAL = 20000, MATERIAL_GLASS = 10000)
/datum/design/item/mechfab/exosuit_equipment/crisisdrone
name = "Mounted Crisis Drone"
build_path = /obj/item/mecha_equipment/crisis_drone
html/changelogs/geeves-mecha_cleaner.yml
+6
View File
@@ -0,0 +1,6 @@
author: Geeves
delete-after: True
changes:
- rscadd: "Added cleaning grenade launchers to the exosuit equipment list in the mechfab."