Fixes some goofs

This commit is contained in:
Anewbe
2018-02-17 01:19:57 -06:00
parent 9bf3791503
commit 5c9fd04ed3
8 changed files with 11 additions and 9 deletions

View File

@@ -102,7 +102,7 @@
desc = "You could probably shock someone badly if you touched them, or recharge something."
icon = 'icons/obj/weapons.dmi'
icon_state = "electric_hand"
show_examine = 0
show_examine = FALSE
var/shock_cost = 10
var/agony_amount = 60

View File

@@ -30,7 +30,7 @@
desc = "This finger appears to be an organic datajack."
icon = 'icons/obj/weapons.dmi'
icon_state = "electric_hand"
show_examine = 0
show_examine = FALSE
/obj/item/weapon/finger_lockpick/New()
if(ismob(loc))

View File

@@ -31,7 +31,7 @@
)
throwforce = 0
force = 0
show_examine = 0
show_examine = FALSE
// var/mob/living/carbon/human/owner = null
var/mob/living/owner = null
var/obj/item/weapon/technomancer_core/core = null

View File

@@ -14,7 +14,7 @@
var/show_messages
var/preserve_item = 0 //whether this object is preserved when its owner goes into cryo-storage, gateway, etc
var/show_examine = 1 // Does this pop up on a mob when the mob is examined?
var/show_examine = TRUE // Does this pop up on a mob when the mob is examined?
/obj/Destroy()
processing_objects -= src

View File

@@ -103,6 +103,7 @@
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sec(src)
new /obj/item/clothing/head/helmet/HoS(src)
new /obj/item/clothing/head/helmet/HoS/hat(src)
new /obj/item/clothing/suit/storage/vest/hos(src)
new /obj/item/clothing/under/rank/head_of_security/jensen(src)
new /obj/item/clothing/under/rank/head_of_security/corp(src)
@@ -162,6 +163,7 @@
new /obj/item/clothing/suit/storage/vest/wardencoat(src)
new /obj/item/clothing/suit/storage/vest/wardencoat/alt(src)
new /obj/item/clothing/head/helmet/warden(src)
new /obj/item/clothing/head/helmet/warden/hat(src)
new /obj/item/weapon/cartridge/security(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)

View File

@@ -112,6 +112,7 @@
desc = "It's a special helmet issued to the Warden of a securiy force."
icon_state = "policehelm"
body_parts_covered = 0
valid_accessory_slots = null
/obj/item/clothing/head/helmet/HoS
name = "Head of Security helmet"
@@ -122,7 +123,7 @@
desc = "The hat of the Head of Security. For showing the officers who's in charge."
icon_state = "hoscap"
body_parts_covered = 0
valid_accessory_slots = null
/obj/item/clothing/head/helmet/HoS/dermal
name = "Dermal Armour Patch"
@@ -138,6 +139,8 @@
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
body_parts_covered = 0
valid_accessory_slots = null
show_examine = FALSE
/obj/item/clothing/head/det/grey
icon_state = "detective2"

View File

@@ -949,12 +949,10 @@ var/global/list/damage_icon_parts = list()
/mob/living/carbon/human/update_inv_head(var/update_icons=1)
world << "update_inv_head"
if(QDESTROYING(src))
return
if(head)
world << "Has head"
head.screen_loc = ui_head //TODO
//Determine the icon to use
@@ -1011,7 +1009,6 @@ var/global/list/damage_icon_parts = list()
var/obj/item/clothing/head/hat = head
if(istype(hat) && hat.accessories.len)
for(var/obj/item/clothing/accessory/A in hat.accessories)
world << "[A.name]"
standing.overlays |= A.get_mob_overlay()
overlays_standing[HEAD_LAYER] = standing

View File

@@ -2407,7 +2407,7 @@
#include "code\ZAS\Zone.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
#include "maps\example\example.dm"
#include "maps\southern_cross\southern_cross.dm"
#include "maps\submaps\_readme.dm"
#include "maps\submaps\space_submaps\space.dm"
#include "maps\submaps\surface_submaps\mountains\mountains.dm"