shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020)

Browse Source 
* Pacifists can now use mech drills on closets containing living beings

* Removes no longer needed Mecha code relating to Pacifist use of drills. Also alters variables to be more consistent. (#36494)
This commit is contained in:
CitadelStationBot
2018-03-19 21:16:44 -05:00
committed by Poojawa
parent 889ff6fa08
commit fcbc76a7a9
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/equipment/mecha_equipment.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/range = MELEE //bitFflags
var/salvageable = 1
var/selectable = 1 // Set to 0 for passive equipment such as mining scanner or armor plates
var/pacifist_safe = TRUE //Controls if equipment can be used to attack by a pacifist.
var/harmful = FALSE //Controls if equipment can be used to attack by a pacifist.
/obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page()
if(chassis)
code/game/mecha/equipment/tools/mining_tools.dm
+1 -1
View File
@@ -12,7 +12,7 @@
equip_cooldown = 15
energy_drain = 10
force = 15
pacifist_safe = FALSE
harmful = TRUE
var/drill_delay = 7
var/drill_level = DRILL_BASIC
code/game/mecha/equipment/tools/work_tools.dm
+1 -1
View File
@@ -10,7 +10,7 @@
energy_drain = 10
var/dam_force = 20
var/obj/mecha/working/ripley/cargo_holder
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M as obj)
if(..())
code/game/mecha/equipment/weapons/weapons.dm
+9 -9
View File
@@ -75,7 +75,7 @@
energy_drain = 30
projectile = /obj/item/projectile/beam/laser
fire_sound = 'sound/weapons/laser.ogg'
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
equip_cooldown = 15
@@ -103,7 +103,7 @@
energy_drain = 500
projectile = /obj/item/projectile/energy/tesla/cannon
fire_sound = 'sound/magic/lightningbolt.ogg'
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
equip_cooldown = 30
@@ -113,7 +113,7 @@
energy_drain = 120
projectile = /obj/item/projectile/beam/pulse/heavy
fire_sound = 'sound/weapons/marauder.ogg'
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma
equip_cooldown = 10
@@ -126,7 +126,7 @@
energy_drain = 30
projectile = /obj/item/projectile/plasma/adv/mech
fire_sound = 'sound/weapons/plasma_cutter.ogg'
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma/can_attach(obj/mecha/working/M)
if(..()) //combat mech
@@ -246,7 +246,7 @@
projectile = /obj/item/projectile/bullet/incendiary/fnx99
projectiles = 24
projectile_energy_cost = 15
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced
name = "\improper S.H.H. \"Quietus\" Carbine"
@@ -257,7 +257,7 @@
projectile = /obj/item/projectile/bullet/mime
projectiles = 6
projectile_energy_cost = 50
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot
name = "\improper LBX AC 10 \"Scattershot\""
@@ -269,7 +269,7 @@
projectile_energy_cost = 25
projectiles_per_shot = 4
variance = 25
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
name = "\improper Ultra AC 2"
@@ -283,7 +283,7 @@
variance = 6
randomspread = 1
projectile_delay = 2
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
name = "\improper SRM-8 missile rack"
@@ -294,7 +294,7 @@
projectiles = 8
projectile_energy_cost = 1000
equip_cooldown = 60
pacifist_safe = FALSE
harmful = TRUE
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher
code/game/mecha/mecha.dm
+2 -7
View File
@@ -442,22 +442,17 @@
return
var/mob/living/L = user
var/obj/structure/closet/C = target
if(!Adjacent(target))
if(selected && selected.is_ranged())
if(L.has_trait(TRAIT_PACIFISM) && !selected.pacifist_safe)
if(L.has_trait(TRAIT_PACIFISM) && selected.harmful)
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return
if(selected.action(target,params))
selected.start_cooldown()
else if(selected && selected.is_melee())
if(isliving(target) && !selected.pacifist_safe && L.has_trait(TRAIT_PACIFISM))
if(isliving(target) && selected.harmful && L.has_trait(TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
return
if(istype(C) && L.has_trait(TRAIT_PACIFISM) && !selected.pacifist_safe && !istype(selected,/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/))
for(var/mob/living/M in C)
to_chat(user, "<span class='warning'>There's someone in there! I don't want to hurt them.</span>")
return
if(selected.action(target,params))
selected.start_cooldown()
else