From 5c9fd04ed34cf3a0d79bb189f7327439ff226ffc Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 17 Feb 2018 01:19:57 -0600 Subject: [PATCH] Fixes some goofs --- code/game/gamemodes/changeling/powers/bioelectrogenesis.dm | 2 +- code/game/gamemodes/changeling/powers/electric_lockpick.dm | 2 +- code/game/gamemodes/technomancer/spell_objs.dm | 2 +- code/game/objects/objs.dm | 2 +- .../structures/crates_lockers/closets/secure/security.dm | 2 ++ code/modules/clothing/head/jobs.dm | 5 ++++- code/modules/mob/living/carbon/human/update_icons.dm | 3 --- polaris.dme | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm index 85fa496181..1579252628 100644 --- a/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm +++ b/code/game/gamemodes/changeling/powers/bioelectrogenesis.dm @@ -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 diff --git a/code/game/gamemodes/changeling/powers/electric_lockpick.dm b/code/game/gamemodes/changeling/powers/electric_lockpick.dm index ab3d79520c..29ad6573f6 100644 --- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm +++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm @@ -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)) diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index 87dee6714c..2a917b4fd8 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -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 diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 4011b3476f..3833133f4a 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -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 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 83aa687957..9d3d3cbf13 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -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) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 0cda9f312f..a215bdca9a 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -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" diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 4c046bc52a..8f47f9b3b6 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -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 diff --git a/polaris.dme b/polaris.dme index 16fc5082af..e026cf9978 100644 --- a/polaris.dme +++ b/polaris.dme @@ -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"