cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing nuke ops / adminspawn combat mechs having tracking beacons.

Browse Source
This commit is contained in:
Ghommie
2019-10-28 18:33:39 +01:00
parent 8e4ec2c0ca
commit e688d37390
9 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/gamemodes/clown_ops/clown_weapons.dm
View File

@@ -267,6 +267,7 @@
operation_req_access = list(ACCESS_SYNDICATE) operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/honker/dark wreckage = /obj/structure/mecha_wreckage/honker/dark
max_equip = 3 max_equip = 3
spawn_tracked = FALSE
/obj/mecha/combat/honker/dark/GrantActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/honker/dark/GrantActions(mob/living/user, human_occupant = 0)
..() ..()

6
code/game/mecha/combat/combat.dm
View File

@@ -3,3 +3,9 @@
internal_damage_threshold = 50 internal_damage_threshold = 50
armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
mouse_pointer = 'icons/mecha/mecha_mouse.dmi' mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
var/spawn_tracked = TRUE
/obj/mecha/combat/Initialize()
. = ..()
if(spawn_tracked)
trackers += new /obj/item/mecha_parts/mecha_tracking(src)

4
code/game/mecha/combat/durand.dm
View File

@@ -19,7 +19,3 @@
/obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
..() ..()
defense_action.Remove(user) defense_action.Remove(user)
/obj/mecha/combat/Initialize()
. = ..()
trackers += new /obj/item/mecha_parts/mecha_tracking(src)

6
code/game/mecha/combat/gygax.dm
View File

@@ -29,6 +29,7 @@
operation_req_access = list(ACCESS_SYNDICATE) operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/gygax/dark wreckage = /obj/structure/mecha_wreckage/gygax/dark
max_equip = 4 max_equip = 4
spawn_tracked = FALSE
/obj/mecha/combat/gygax/dark/loaded/Initialize() /obj/mecha/combat/gygax/dark/loaded/Initialize()
. = ..() . = ..()
@@ -48,7 +49,6 @@
return return
cell = new /obj/item/stock_parts/cell/hyper(src) cell = new /obj/item/stock_parts/cell/hyper(src)
/obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0)
..() ..()
overload_action.Grant(user, src) overload_action.Grant(user, src)
@@ -65,7 +65,3 @@
/obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
..() ..()
thrusters_action.Remove(user) thrusters_action.Remove(user)
/obj/mecha/combat/Initialize()
. = ..()
trackers += new /obj/item/mecha_parts/mecha_tracking(src)

4
code/game/mecha/combat/honker.dm
View File

@@ -153,7 +153,3 @@
for (var/i=0;i<6;i++) for (var/i=0;i<6;i++)
color = color+pick(colors) color = color+pick(colors)
return color return color
/obj/mecha/combat/Initialize()
. = ..()
trackers += new /obj/item/mecha_parts/mecha_tracking(src)

1
code/game/mecha/combat/marauder.dm
View File

@@ -16,6 +16,7 @@
force = 45 force = 45
max_equip = 4 max_equip = 4
bumpsmash = 1 bumpsmash = 1
spawn_tracked = FALSE
/obj/mecha/combat/marauder/GrantActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/marauder/GrantActions(mob/living/user, human_occupant = 0)
..() ..()

1
code/game/mecha/combat/neovgre.dm
View File

@@ -13,6 +13,7 @@
breach_time = 100 //ten seconds till all goes to shit breach_time = 100 //ten seconds till all goes to shit
recharge_rate = 100 recharge_rate = 100
wreckage = /obj/structure/mecha_wreckage/durand/neovgre wreckage = /obj/structure/mecha_wreckage/durand/neovgre
spawn_tracked = FALSE
/obj/mecha/combat/neovgre/GrantActions(mob/living/user, human_occupant = 0) //No Eject action for you sonny jim, your life for Ratvar! /obj/mecha/combat/neovgre/GrantActions(mob/living/user, human_occupant = 0) //No Eject action for you sonny jim, your life for Ratvar!
internals_action.Grant(user, src) internals_action.Grant(user, src)

4
code/game/mecha/combat/phazon.dm
View File

@@ -27,7 +27,3 @@
..() ..()
switch_damtype_action.Remove(user) switch_damtype_action.Remove(user)
phasing_action.Remove(user) phasing_action.Remove(user)
/obj/mecha/combat/Initialize()
. = ..()
trackers += new /obj/item/mecha_parts/mecha_tracking(src)

1
code/game/mecha/combat/reticence.dm
View File

@@ -18,6 +18,7 @@
stepsound = null stepsound = null
turnsound = null turnsound = null
opacity = 0 opacity = 0
spawn_tracked = FALSE
/obj/mecha/combat/reticence/loaded/Initialize() /obj/mecha/combat/reticence/loaded/Initialize()
. = ..() . = ..()