Merge pull request #7043 from SamHPurp/assorted-fixes

Fixes
This commit is contained in:
Fox McCloud
2017-04-05 19:15:12 -04:00
committed by GitHub
16 changed files with 132 additions and 126 deletions
+3 -3
View File
@@ -26,9 +26,9 @@
if(M.mind)
for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list)
S.charge_counter = S.charge_max
to_chat(M, "<span class='notice'>you feel raw magic flowing through you, it feels good!</span>")
to_chat(M, "<span class='notice'>You feel raw magical energy flowing through you, it feels good!</span>")
else
to_chat(M, "<span class='notice'>you feel very strange for a moment, but then it passes.</span>")
to_chat(M, "<span class='notice'>You feel very strange for a moment, but then it passes.</span>")
burnt_out = 1
charged_item = M
break
@@ -85,7 +85,7 @@
charged_item = item
break
if(!charged_item)
to_chat(L, "<span class='notice'>you feel magical power surging to your hands, but the feeling rapidly fades...</span>")
to_chat(L, "<span class='notice'>You feel magical power surging to your hands, but the feeling rapidly fades...</span>")
else if(burnt_out)
to_chat(L, "<span class='caution'>[charged_item] doesn't seem to be reacting to the spell...</span>")
else
+2 -2
View File
@@ -173,8 +173,8 @@
/obj/item/clothing/suit/hooded/cultrobes/berserker
name = "flagellant's robes"
desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
icon_state = "hardsuit-beserker"
item_state = "hardsuit-beserker"
icon_state = "hardsuit-berserker"
item_state = "hardsuit-berserker"
flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -322,7 +322,7 @@
D.pixel_y = target.pixel_y
if(do_mob(src, target, 100))
if(!src.Adjacent(target))
to_chat(src, "<span class='info'>Error:Dismantleing aborted.</span>")
to_chat(src, "<span class='info'>Error:Dismantling aborted.</span>")
else
to_chat(src, "<span class='info'>Dismantling complete.</span>")
var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc)
@@ -437,7 +437,7 @@
/mob/living/simple_animal/hostile/swarmer/proc/CreateTrap()
set name = "Create trap"
set category = "Swarmer"
set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources"
set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources."
if(locate(/obj/structure/swarmer/trap) in loc)
to_chat(src, "<span class='warning'>There is already a trap here. Aborting.</span>")
return
+9 -3
View File
@@ -178,7 +178,7 @@
var/time_till_despawn = 9000 // This is reduced by 90% if a player manually enters cryo
var/willing_time_divisor = 10
var/time_entered = 0 // Used to keep track of the safe period.
var/obj/item/device/radio/intercom/announce //
var/obj/item/device/radio/intercom/announce
var/obj/machinery/computer/cryopod/control_computer
var/last_no_computer_message = 0
@@ -192,12 +192,18 @@
/obj/item/device/paicard,
/obj/item/weapon/gun,
/obj/item/weapon/pinpointer,
/obj/item/clothing/suit,
/obj/item/clothing/shoes/magboots,
/obj/item/areaeditor/blueprints,
/obj/item/clothing/head/helmet/space,
/obj/item/clothing/suit/space,
/obj/item/clothing/suit/armor,
/obj/item/weapon/defibrillator/compact,
/obj/item/weapon/reagent_containers/hypospray/CMO,
/obj/item/clothing/accessory/medal/gold/captain,
/obj/item/clothing/gloves/color/black/krav_maga/sec,
/obj/item/weapon/storage/internal,
/obj/item/device/spacepod_key
/obj/item/device/spacepod_key,
/obj/item/weapon/nullrod
)
// These items will NOT be preserved
var/list/do_not_preserve_items = list (
@@ -1,6 +1,6 @@
/obj/mecha/combat/recitence
/obj/mecha/combat/reticence
desc = "A silent, fast, and nigh-invisible miming exosuit. Popular among mimes and mime assassins."
name = "\improper Recitence"
name = "\improper Reticence"
icon_state = "mime"
initial_icon = "mime"
step_in = 2
@@ -9,7 +9,7 @@
deflect_chance = 30
damage_absorption = list("brute"=0.75,"fire"=1,"bullet"=0.8,"laser"=0.7,"energy"=0.85,"bomb"=1)
max_temperature = 15000
wreckage = /obj/effect/decal/mecha_wreckage/recitence
wreckage = /obj/effect/decal/mecha_wreckage/reticence
operation_req_access = list(access_mime)
add_req_access = 0
internal_damage_threshold = 60
@@ -18,7 +18,7 @@
stepsound = null
turnsound = null
/obj/mecha/combat/recitence/loaded/New()
/obj/mecha/combat/reticence/loaded/New()
..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
ME.attach(src)
@@ -285,14 +285,14 @@
/obj/item/mecha_parts/mecha_equipment/mimercd
name = "mounted MRCD"
desc = "An exosuit-mounted Mime Rapid Construction Device. (Can be attached to: Recitence)"
desc = "An exosuit-mounted Mime Rapid Construction Device. (Can be attached to: Reticence)"
icon_state = "mecha_rcd"
origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4"
equip_cooldown = 10
energy_drain = 250
range = MELEE|RANGED
/obj/item/mecha_parts/mecha_equipment/mimercd/can_attach(obj/mecha/combat/recitence/M)
/obj/item/mecha_parts/mecha_equipment/mimercd/can_attach(obj/mecha/combat/reticence/M)
if(..())
if(istype(M))
return 1
+2 -2
View File
@@ -183,7 +183,7 @@
spawn(20)
if(thingy)
walk(thingy,0)
for(var/obj/mecha/combat/recitence/R in oview(6, chassis))
for(var/obj/mecha/combat/reticence/R in oview(6, chassis))
R.occupant_message("\The [R] has protected you from [chassis]'s HONK at the cost of some power.")
R.use_power(R.get_charge() / 4)
@@ -244,7 +244,7 @@
projectiles = 20
projectile_energy_cost = 50
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced/can_attach(obj/mecha/combat/recitence/M as obj)
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced/can_attach(obj/mecha/combat/reticence/M as obj)
if(..())
if(istype(M))
return 1
+1 -1
View File
@@ -39,7 +39,7 @@
"Gygax",
"Durand",
"H.O.N.K",
"Recitence",
"Reticence",
"Phazon",
"Exosuit Equipment",
"Cyborg Upgrade Modules",
+20 -20
View File
@@ -863,48 +863,48 @@
feedback_inc("mecha_honker_created",1)
return
/datum/construction/mecha/recitence_chassis
steps = list(list("key"=/obj/item/mecha_parts/part/recitence_torso),//1
list("key"=/obj/item/mecha_parts/part/recitence_left_arm),//2
list("key"=/obj/item/mecha_parts/part/recitence_right_arm),//3
list("key"=/obj/item/mecha_parts/part/recitence_left_leg),//4
list("key"=/obj/item/mecha_parts/part/recitence_right_leg),//5
list("key"=/obj/item/mecha_parts/part/recitence_head)
/datum/construction/mecha/reticence_chassis
steps = list(list("key"=/obj/item/mecha_parts/part/reticence_torso),//1
list("key"=/obj/item/mecha_parts/part/reticence_left_arm),//2
list("key"=/obj/item/mecha_parts/part/reticence_right_arm),//3
list("key"=/obj/item/mecha_parts/part/reticence_left_leg),//4
list("key"=/obj/item/mecha_parts/part/reticence_right_leg),//5
list("key"=/obj/item/mecha_parts/part/reticence_head)
)
/datum/construction/mecha/recitence_chassis/action(atom/used_atom,mob/user as mob)
/datum/construction/mecha/reticence_chassis/action(atom/used_atom,mob/user as mob)
return check_all_steps(used_atom,user)
/datum/construction/mecha/recitence_chassis/custom_action(step, atom/used_atom, mob/user)
/datum/construction/mecha/reticence_chassis/custom_action(step, atom/used_atom, mob/user)
user.visible_message("[user] has connected [used_atom] to the [holder].", "You connect [used_atom] to the [holder]")
holder.overlays += used_atom.icon_state + "+o"
qdel(used_atom)
return 1
/datum/construction/mecha/recitence_chassis/spawn_result()
/datum/construction/mecha/reticence_chassis/spawn_result()
var/obj/item/mecha_parts/chassis/const_holder = holder
const_holder.construct = new /datum/construction/mecha/recitence(const_holder)
const_holder.construct = new /datum/construction/mecha/reticence(const_holder)
const_holder.density = 1
qdel(src)
return
/datum/construction/mecha/recitence
result = "/obj/mecha/combat/recitence"
/datum/construction/mecha/reticence
result = "/obj/mecha/combat/reticence"
steps = list(list("key"=/obj/effect/dummy/mecha_emote_step),//1
list("key"=/obj/item/clothing/suit/suspenders),//2
list("key"=/obj/effect/dummy/mecha_emote_step),//3
list("key"=/obj/item/clothing/mask/gas/mime),//4
list("key"=/obj/effect/dummy/mecha_emote_step),//5
list("key"=/obj/item/clothing/head/beret),//6
list("key"=/obj/item/weapon/circuitboard/mecha/recitence/targeting),//7
list("key"=/obj/item/weapon/circuitboard/mecha/recitence/peripherals),//8
list("key"=/obj/item/weapon/circuitboard/mecha/recitence/main),//9
list("key"=/obj/item/weapon/circuitboard/mecha/reticence/targeting),//7
list("key"=/obj/item/weapon/circuitboard/mecha/reticence/peripherals),//8
list("key"=/obj/item/weapon/circuitboard/mecha/reticence/main),//9
)
/datum/construction/mecha/recitence/action(atom/used_atom,mob/user)
/datum/construction/mecha/reticence/action(atom/used_atom,mob/user)
return check_step(used_atom,user)
/datum/construction/mecha/recitence/custom_action(step, atom/used_atom, mob/user)
/datum/construction/mecha/reticence/custom_action(step, atom/used_atom, mob/user)
if(!..())
return 0
@@ -935,9 +935,9 @@
qdel(used_atom)
return 1
/datum/construction/mecha/recitence/spawn_result()
/datum/construction/mecha/reticence/spawn_result()
..()
feedback_inc("mecha_recitence_created",1)
feedback_inc("mecha_reticence_created",1)
return
/datum/construction/mecha/durand_chassis
+32 -32
View File
@@ -223,14 +223,14 @@
icon_state = "honker_r_leg"
////////// Recitence
////////// Reticence
/obj/item/mecha_parts/chassis/recitence
name = "Recitence Chassis"
/obj/item/mecha_parts/chassis/reticence
name = "Reticence Chassis"
/obj/item/mecha_parts/chassis/recitence/New()
/obj/item/mecha_parts/chassis/reticence/New()
..()
construct = new /datum/construction/mecha/recitence_chassis(src)
construct = new /datum/construction/mecha/reticence_chassis(src)
/obj/effect/dummy/mecha_emote_step
var/emote
@@ -238,37 +238,37 @@
/obj/effect/dummy/mecha_emote_step/New(e)
emote = e
/obj/item/mecha_parts/chassis/recitence/hear_message(mob/living/M, msg)
if(!istype(M) || !istype(construct, /datum/construction/mecha/recitence))
/obj/item/mecha_parts/chassis/reticence/hear_message(mob/living/M, msg)
if(!istype(M) || !istype(construct, /datum/construction/mecha/reticence))
return
// is the current step the dummy emote object?
var/list/steps = construct.steps
if(steps[steps.len]["key"] == /obj/effect/dummy/mecha_emote_step)
construct.action(new /obj/effect/dummy/mecha_emote_step(msg), M)
/obj/item/mecha_parts/part/recitence_torso
name = "Recitence Torso"
icon_state = "recitence_harness"
/obj/item/mecha_parts/part/reticence_torso
name = "Reticence Torso"
icon_state = "reticence_harness"
/obj/item/mecha_parts/part/recitence_head
name = "Recitence Head"
icon_state = "recitence_head"
/obj/item/mecha_parts/part/reticence_head
name = "Reticence Head"
icon_state = "reticence_head"
/obj/item/mecha_parts/part/recitence_left_arm
name = "Recitence Left Arm"
icon_state = "recitence_l_arm"
/obj/item/mecha_parts/part/reticence_left_arm
name = "Reticence Left Arm"
icon_state = "reticence_l_arm"
/obj/item/mecha_parts/part/recitence_right_arm
name = "Recitence Right Arm"
icon_state = "recitence_r_arm"
/obj/item/mecha_parts/part/reticence_right_arm
name = "Reticence Right Arm"
icon_state = "reticence_r_arm"
/obj/item/mecha_parts/part/recitence_left_leg
name = "Recitence Left Leg"
icon_state = "recitence_l_leg"
/obj/item/mecha_parts/part/reticence_left_leg
name = "Reticence Left Leg"
icon_state = "reticence_l_leg"
/obj/item/mecha_parts/part/recitence_right_leg
name = "Recitence Right Leg"
icon_state = "recitence_r_leg"
/obj/item/mecha_parts/part/reticence_right_leg
name = "Reticence Right Leg"
icon_state = "reticence_r_leg"
////////// Phazon
@@ -455,19 +455,19 @@
name = "Circuit board (H.O.N.K Central Control module)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/recitence
/obj/item/weapon/circuitboard/mecha/reticence
origin_tech = "programming=4"
/obj/item/weapon/circuitboard/mecha/recitence/peripherals
name = "circuit board (Reticience Peripherals Control module)"
/obj/item/weapon/circuitboard/mecha/reticence/peripherals
name = "circuit board (Reticence Peripherals Control module)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/recitence/targeting
name = "circuit board (Reticience Weapon Control and Targeting module)"
/obj/item/weapon/circuitboard/mecha/reticence/targeting
name = "circuit board (Reticence Weapon Control and Targeting module)"
icon_state = "mcontroller"
/obj/item/weapon/circuitboard/mecha/recitence/main
name = "circuit board (Reticience Central Control module)"
/obj/item/weapon/circuitboard/mecha/reticence/main
name = "circuit board (Reticence Central Control module)"
icon_state = "mainboard"
/obj/item/weapon/circuitboard/mecha/odysseus
+2 -2
View File
@@ -118,8 +118,8 @@
name = "Seraph wreckage"
icon_state = "seraph-broken"
/obj/effect/decal/mecha_wreckage/recitence
name = "\improper Recitence wreckage"
/obj/effect/decal/mecha_wreckage/reticence
name = "\improper Reticence wreckage"
icon_state = "mime-broken"
/obj/effect/decal/mecha_wreckage/ripley
+1 -1
View File
@@ -76,7 +76,7 @@
return attack_hand(user)
/obj/structure/ladder/dive_point/buoy
name = "diving point bouy"
name = "diving point buoy"
desc = "A buoy marking the location of an underwater dive area."
icon = 'icons/misc/beach.dmi'
icon_state = "buoy"
+15 -15
View File
@@ -167,32 +167,32 @@
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
category = list("Exosuit Modules")
/datum/design/recitence_main
name = "Exosuit Module (\"Recitence\" Central Control module)"
desc = "Allows for the construction of a \"Recitence\" Central Control module."
id = "recitence_main"
/datum/design/reticence_main
name = "Exosuit Module (\"Reticence\" Central Control module)"
desc = "Allows for the construction of a \"Reticence\" Central Control module."
id = "reticence_main"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/main
build_path = /obj/item/weapon/circuitboard/mecha/reticence/main
category = list("Exosuit Modules")
/datum/design/recitence_peri
name = "Exosuit Module (\"Recitence\" Peripherals Control module)"
desc = "Allows for the construction of a \"Recitence\" Peripheral Control module."
id = "recitence_peri"
/datum/design/reticence_peri
name = "Exosuit Module (\"Reticence\" Peripherals Control module)"
desc = "Allows for the construction of a \"Reticence\" Peripheral Control module."
id = "reticence_peri"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/peripherals
build_path = /obj/item/weapon/circuitboard/mecha/reticence/peripherals
category = list("Exosuit Modules")
/datum/design/recitence_targ
name = "Exosuit Module (\"Recitence\" Weapons & Targeting Control module)"
desc = "Allows for the construction of a \"Recitence\" Weapons & Targeting Control module."
id = "recitence_targ"
/datum/design/reticence_targ
name = "Exosuit Module (\"Reticence\" Weapons & Targeting Control module)"
desc = "Allows for the construction of a \"Reticence\" Weapons & Targeting Control module."
id = "reticence_targ"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
build_path = /obj/item/weapon/circuitboard/mecha/recitence/targeting
build_path = /obj/item/weapon/circuitboard/mecha/reticence/targeting
category = list("Exosuit Modules")
@@ -459,69 +459,69 @@
construction_time = 200
category = list("H.O.N.K")
//Recitence
/datum/design/recitence_chassis
name = "Exosuit Chassis (\"Recitence\")"
id = "recitence_chassis"
//Reticence
/datum/design/reticence_chassis
name = "Exosuit Chassis (\"Reticence\")"
id = "reticence_chassis"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/chassis/recitence
build_path = /obj/item/mecha_parts/chassis/reticence
materials = list(MAT_METAL=20000)
construction_time = 100
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_torso
name = "Exosuit Torso (\"Recitence\")"
id = "recitence_torso"
/datum/design/reticence_torso
name = "Exosuit Torso (\"Reticence\")"
id = "reticence_torso"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_torso
build_path = /obj/item/mecha_parts/part/reticence_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
construction_time = 300
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_head
name = "Exosuit Head (\"Recitence\")"
id = "recitence_head"
/datum/design/reticence_head
name = "Exosuit Head (\"Reticence\")"
id = "reticence_head"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_head
build_path = /obj/item/mecha_parts/part/reticence_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_left_arm
name = "Exosuit Left Arm (\"Recitence\")"
id = "recitence_left_arm"
/datum/design/reticence_left_arm
name = "Exosuit Left Arm (\"Reticence\")"
id = "reticence_left_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_left_arm
build_path = /obj/item/mecha_parts/part/reticence_left_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_right_arm
name = "Exosuit Right Arm (\"Recitence\")"
id = "recitence_right_arm"
/datum/design/reticence_right_arm
name = "Exosuit Right Arm (\"Reticence\")"
id = "reticence_right_arm"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_arm
build_path = /obj/item/mecha_parts/part/reticence_right_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_left_leg
name = "Exosuit Left Leg (\"Recitence\")"
id = "recitence_left_leg"
/datum/design/reticence_left_leg
name = "Exosuit Left Leg (\"Reticence\")"
id = "reticence_left_leg"
build_type = MECHFAB
build_path =/obj/item/mecha_parts/part/recitence_left_leg
build_path =/obj/item/mecha_parts/part/reticence_left_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
/datum/design/recitence_right_leg
name = "Exosuit Right Leg (\"Recitence\")"
id = "recitence_right_leg"
/datum/design/reticence_right_leg
name = "Exosuit Right Leg (\"Reticence\")"
id = "reticence_right_leg"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/part/recitence_right_leg
build_path = /obj/item/mecha_parts/part/reticence_right_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
category = list("Recitence")
category = list("Reticence")
//Phazon
/datum/design/phazon_chassis
Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

+1 -1
View File
@@ -644,7 +644,7 @@
#include "code\game\mecha\combat\honker.dm"
#include "code\game\mecha\combat\marauder.dm"
#include "code\game\mecha\combat\phazon.dm"
#include "code\game\mecha\combat\recitence.dm"
#include "code\game\mecha\combat\reticence.dm"
#include "code\game\mecha\equipment\mecha_equipment.dm"
#include "code\game\mecha\equipment\tools\medical_tools.dm"
#include "code\game\mecha\equipment\tools\mining_tools.dm"