diff --git a/baystation12.dme b/baystation12.dme index a72955196df..28d20df74c3 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -931,8 +931,6 @@ #include "code\WorkInProgress\AI_Visibility\util.dm" #include "code\WorkInProgress\animusstation\atm.dm" #include "code\WorkInProgress\Cael_Aislinn\power_monitor.dm" -#include "code\WorkInProgress\Cael_Aislinn\BirdMan\bird_transformation.dm" -#include "code\WorkInProgress\Cael_Aislinn\BirdMan\birdman.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm" diff --git a/code/WorkInProgress/SkyMarshal/portalathe.dm b/code/WorkInProgress/SkyMarshal/portalathe.dm index bbd27df919d..083ce09a192 100644 --- a/code/WorkInProgress/SkyMarshal/portalathe.dm +++ b/code/WorkInProgress/SkyMarshal/portalathe.dm @@ -1,8 +1,9 @@ //May expand later, but right now it just repairs lights. /obj/item/device/portalathe - name = "\improper Portable Autolathe" - desc = "It blinks and has an antenna on it. It must be advanced." - icon_state = "t-ray0" + name = "portable autolathe" + desc = "A device which can repair broken lights instantly. Must be advanced." + icon = 'janitor.dmi' + icon_state = "portalathe" afterattack(var/atom/target, mob/user as mob) if(!target || !user) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 9b70e7f0f77..c143fc109aa 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -208,11 +208,13 @@ icon_state = "spacecash20" access = access_crate_cash desc = "A pile of 20 credits." + worth = 20 /obj/item/weapon/money/c50 icon_state = "spacecash50" access = access_crate_cash desc = "A pile of 50 credits." + worth = 50 /obj/item/weapon/money/c100 icon_state = "spacecash100" diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 8d626ed3a2a..1647eb7047f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -23,7 +23,7 @@ desc = "A set of armored robes worn by the followers of Nar-Sie" icon_state = "cultrobes" item_state = "cultrobes" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) @@ -43,7 +43,7 @@ desc = "A set of armored robes worn by the followers of Nar-Sie" icon_state = "magusred" item_state = "magusred" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index de5514ddd89..66e71c124a2 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1086,6 +1086,7 @@ datum reagent + weight = 20 var/target_name New(var/text,var/joba) ..() diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 1293cfce2b1..82b5235c2c4 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -905,7 +905,10 @@ if (ismob(loc)) var/mob/M = loc M.show_message("\red Your [src] explodes!", 1) - + if (src in M.contents) + if(fon) + fon = 0 + M.total_luminosity -= f_lum if(T) T.hotspot_expose(700,125) diff --git a/code/game/objects/toys.dm b/code/game/objects/toys.dm index 02ffbd272d6..4cf697d8746 100644 --- a/code/game/objects/toys.dm +++ b/code/game/objects/toys.dm @@ -140,7 +140,7 @@ CRAYONS user << "You start drawing a rune on the [target.name]." if(instant || do_after(user, 50)) if(user.equipped() == src) - new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype) + new /obj/effect/decal/cleanable/crayon(user.client,target,colour,shadeColour,drawtype) user << "You finish drawing." if(uses) uses-- @@ -175,6 +175,7 @@ CRAYONS icon = 'rune.dmi' layer = 2.1 anchored = 1 + var/client/who_drew_this examine() @@ -183,9 +184,10 @@ CRAYONS return - New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune") + New(who,location,main = "#FFFFFF",shade = "#000000",var/type = "rune") ..() loc = location + who_drew_this = who name = type desc = "A [type] drawn in crayon." diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index a3bcaabcc38..5135238bab6 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1580,9 +1580,9 @@ if(!reagents.total_volume) if(M == user) user << "\red You finish eating [src]." else user << "\red [M] finishes eating [src]." + del(src) spawn(5) user.update_clothing() - del(src) playsound(M.loc,'eatfood.ogg', rand(10,50), 1) return 1 else if(istype(M, /mob/living/simple_animal/livestock)) @@ -1979,14 +1979,7 @@ attackby(var/obj/D, mob/user as mob) if(isprox(D)) - var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor - B.loc = user - if (user.r_hand == D) - user.u_equip(D) - user.r_hand = B - else - user.u_equip(D) - user.l_hand = B + var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor(user.loc) B.layer = 20 user << "You add the sensor to the bucket" del(D) diff --git a/code/modules/clothing/jumpsuit.dm b/code/modules/clothing/jumpsuit.dm index afefffb0a4d..52cd992c82a 100644 --- a/code/modules/clothing/jumpsuit.dm +++ b/code/modules/clothing/jumpsuit.dm @@ -7,7 +7,7 @@ protective_temperature = T0C + 50 heat_transfer_coefficient = 0.30 permeability_coefficient = 0.90 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS var/has_sensor = 1//For the crew computer 2 = unable to change mode var/sensor_mode = 0 /* diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 7c3a2e678ab..487e076c9a1 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -27,7 +27,7 @@ icon_state = "santa" item_state = "santa" slowdown = 0 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL | SUITSPACE + flags = FPRINT | TABLEPASS | SUITSPACE allowed = list(/obj/item) //for stuffing exta special presents diff --git a/code/modules/clothing/suit.dm b/code/modules/clothing/suit.dm index b312d4e6bd3..55f1cbaaa84 100644 --- a/code/modules/clothing/suit.dm +++ b/code/modules/clothing/suit.dm @@ -2,6 +2,6 @@ icon = 'suits.dmi' name = "suit" var/fire_resist = T0C+100 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 75a8fbfa406..dae33f4a011 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -10,7 +10,7 @@ desc = "An armored vest that protects against some damage." icon_state = "armor" item_state = "armor" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) /obj/item/clothing/suit/armor/vest/warden @@ -51,7 +51,7 @@ icon_state = "gearharness" item_state = "gearharness" body_parts_covered = UPPER_TORSO|LOWER_TORSO - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police) flags_inv = 0 @@ -62,7 +62,7 @@ icon_state = "reactiveoff" item_state = "reactiveoff" slowdown = 1 - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/storage/armourrigvest @@ -71,7 +71,7 @@ icon_state = "armourrigvest" item_state = "armourrigvest" body_parts_covered = UPPER_TORSO|LOWER_TORSO - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/detective.dm b/code/modules/clothing/suits/detective.dm index 7b07ce3a8d0..269bf437af1 100644 --- a/code/modules/clothing/suits/detective.dm +++ b/code/modules/clothing/suits/detective.dm @@ -21,7 +21,7 @@ desc = "An armored vest with a detective's badge on it." icon_state = "detective-armor" item_state = "armor" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS body_parts_covered = UPPER_TORSO|LOWER_TORSO allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) diff --git a/code/modules/clothing/suits/heavy.dm b/code/modules/clothing/suits/heavy.dm index c05940bf6ab..0a97bfaa5fc 100644 --- a/code/modules/clothing/suits/heavy.dm +++ b/code/modules/clothing/suits/heavy.dm @@ -74,7 +74,7 @@ icon_state = "invisible" item_state = "invisible" body_parts_covered = UPPER_TORSO|LOWER_TORSO - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/pepperspray,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/taperoll/police) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) flags_inv = 0 diff --git a/code/modules/clothing/uniforms/lawyer.dm b/code/modules/clothing/uniforms/lawyer.dm index 5bce12301ab..95592729258 100644 --- a/code/modules/clothing/uniforms/lawyer.dm +++ b/code/modules/clothing/uniforms/lawyer.dm @@ -60,6 +60,6 @@ desc = "This robe commands authority." icon_state = "judge" item_state = "judge" - flags = FPRINT | TABLEPASS | ONESIZEFITSALL + flags = FPRINT | TABLEPASS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index df52c824503..59fbac4e145 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -228,11 +228,6 @@ Metroid.UpdateFeed() return - /*if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT) - if(prob(40) && !(mutations & FAT)) - src << "\red You fail to push [tmob]'s fat ass out of the way." - now_pushing = 0 - return*/ if(tmob.r_hand && istype(tmob.r_hand, /obj/item/weapon/shield/riot)) if(prob(99)) now_pushing = 0 @@ -297,8 +292,6 @@ if(shoes) tally += shoes.slowdown - /*if(mutations & FAT) - tally += 1.5*/ if(bodytemperature < 283.222) tally += (283.222 - bodytemperature) / 10 * 1.75 if (stuttering < 10) @@ -587,9 +580,6 @@ return if (!( istype(W, /obj/item/clothing/suit) )) return - /*if (mutations & FAT && !(W.flags & ONESIZEFITSALL)) - src << "\red You're too fat to wear the [W.name]!" - return*/ u_equip(W) wear_suit = W W.equipped(src, text) @@ -695,9 +685,6 @@ return if (!( istype(W, /obj/item/clothing/under) )) return - /*if (mutations & FAT && !(W.flags & ONESIZEFITSALL)) - src << "\red You're too fat to wear the [W.name]!" - return*/ u_equip(W) w_uniform = W W.equipped(src, text) @@ -861,19 +848,14 @@ overlays = null - // lol - var/fat = "" - if (mutations & FAT) - fat = "fat" - if (mutations & HULK) - overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat]_[gender][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk_[gender][!lying ? "_s" : "_l"]") if (mutations & COLD_RESISTANCE) - overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[!lying ? "_s" : "_l"]") if (mutations & TK) - overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[!lying ? "_s" : "_l"]") if (mutations & LASER) overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]") @@ -881,7 +863,7 @@ if (mutantrace) switch(mutantrace) if("golem","metroid") - overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][!lying ? "_s" : "_l"]") if(face_standing) del(face_standing) if(face_lying) @@ -891,7 +873,7 @@ if(lying_icon) del(lying_icon) if("lizard") - overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender][!lying ? "_s" : "_l"]") if(face_standing) del(face_standing) if(face_lying) @@ -902,7 +884,7 @@ del(lying_icon) if("plant") if(stat != 2) //if not dead, that is - overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]") + overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender][!lying ? "_s" : "_l"]") else overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_d") if(face_standing) @@ -925,20 +907,6 @@ else lying = 1 - // Automatically drop anything in store / id / belt if you're not wearing a uniform. - if (!w_uniform) - for (var/obj/item/thing in list(r_store, l_store, wear_id, belt)) - if (thing) - u_equip(thing) - if (client) - client.screen -= thing - - if (thing) - thing.loc = loc - thing.dropped(src) - thing.layer = initial(thing.layer) - - //if (zone_sel) // zone_sel.overlays = null // zone_sel.overlays += body_standing @@ -961,30 +929,28 @@ // Uniform if(w_uniform) - /*if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL)) - src << "\red You burst out of the [w_uniform.name]!" - var/obj/item/clothing/c = w_uniform - u_equip(c) - if(client) - client.screen -= c - if(c) - c:loc = loc - c:dropped(src) - c:layer = initial(c:layer)*/ - if(w_uniform)//I should really not need these - w_uniform.screen_loc = ui_iclothing + w_uniform.screen_loc = ui_iclothing + if(istype(w_uniform, /obj/item/clothing/under)) var/t1 = w_uniform.color if (!t1) t1 = icon_state - if (mutations & FAT) - overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER) - else - overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER) + overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER) if (w_uniform.blood_DNA) var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]") overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) + else // Automatically drop anything in store / id / belt if you're not wearing a uniform. + for (var/obj/item/thing in list(r_store, l_store, wear_id, belt)) + if (thing) + u_equip(thing) + if (client) + client.screen -= thing + if (thing) + thing.loc = loc + thing.dropped(src) + thing.layer = initial(thing.layer) + if (wear_id) if(wear_id.over_jumpsuit) overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER) @@ -1025,10 +991,12 @@ else if(ro.destroyed) stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY) overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) + // Glasses if (glasses) var/t1 = glasses.icon_state overlays += image("icon" = 'eyes.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER) + // Ears if (l_ear) var/t1 = l_ear.icon_state @@ -1036,6 +1004,7 @@ if (r_ear) var/t1 = r_ear.icon_state overlays += image("icon" = 'ears.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER) + // Shoes lo = organs["l_foot"] ro = organs["r_foot"] @@ -1054,6 +1023,7 @@ else if(ro.destroyed) stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY) overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) // Radio + /* if (w_radio) overlays += image("icon" = 'ears.dmi', "icon_state" = "headset[!lying ? "" : "2"]", "layer" = MOB_LAYER) */ @@ -1087,19 +1057,10 @@ if (wear_suit) - /*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL)) - src << "\red You burst out of the [wear_suit.name]!" - var/obj/item/clothing/c = wear_suit - u_equip(c) - if(client) - client.screen -= c - if(c) - c:loc = loc - c:dropped(src) - c:layer = initial(c:layer)*/ if (istype(wear_suit, /obj/item/clothing/suit)) var/t1 = wear_suit.icon_state overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER) + if (wear_suit) if (wear_suit.blood_DNA) var/icon/stain_icon = null @@ -1111,6 +1072,7 @@ stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]") overlays += image("icon" = stain_icon, "layer" = MOB_LAYER) wear_suit.screen_loc = ui_oclothing + if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket)) if (handcuffed) handcuffed.loc = loc @@ -1376,7 +1338,6 @@ lying_icon = new /icon('human.dmi', "torso_[g]_l") var/husk = (mutations & HUSK) - var/obese = (mutations & FAT) stand_icon.Blend(new /icon('human.dmi', "chest_[g]_s"), ICON_OVERLAY) lying_icon.Blend(new /icon('human.dmi', "chest_[g]_l"), ICON_OVERLAY) @@ -1417,9 +1378,6 @@ stand_icon.Blend(husk_s, ICON_OVERLAY) lying_icon.Blend(husk_l, ICON_OVERLAY) - else if(obese) - stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY) - lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY) // Skin tone if (s_tone >= 0) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f091d8bf000..44fa38e6c61 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1109,16 +1109,16 @@ else seer = 0 see_invisible = 0 + else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) switch(wear_mask:mode) if(0) - if(client) - var/target_list[] = list() - for(var/mob/living/target in oview(src)) - if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind. - target_list += target - if(target_list.len)//Everything else is handled by the ninja mask proc. - wear_mask:assess_targets(target_list, src) + var/target_list[] = list() + for(var/mob/living/target in oview(src)) + if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind. + target_list += target + if(target_list.len)//Everything else is handled by the ninja mask proc. + wear_mask:assess_targets(target_list, src) if (!druggy) see_invisible = 0 if(1) @@ -1133,6 +1133,7 @@ sight |= SEE_TURFS if(!druggy) see_invisible = 0 + else if(istype(glasses, /obj/item/clothing/glasses/meson)) sight |= SEE_TURFS if(!druggy) @@ -1142,10 +1143,12 @@ see_in_dark = 5 if(!druggy) see_invisible = 0 + else if(istype(glasses, /obj/item/clothing/glasses/thermal)) sight |= SEE_MOBS if(!druggy) see_invisible = 2 + else if(istype(glasses, /obj/item/clothing/glasses/material)) sight |= SEE_OBJS if (!druggy) @@ -1176,11 +1179,6 @@ see_invisible = 0 - - - - - else if(istype(head, /obj/item/clothing/head/helmet/welding)) // wat. This is never fucking called. if(!head:up && tinted_weldhelh) see_in_dark = 1 @@ -1194,23 +1192,20 @@ // Special on-map HUDs like the medical HUD // ---------------------------------------- if(istype(glasses, /obj/item/clothing/glasses/hud/health)) - if(client) - glasses:process_hud(src) + glasses:process_hud(src) if (!druggy) see_invisible = 0 - if(istype(glasses, /obj/item/clothing/glasses/hud/security)) - if(client) - glasses:process_hud(src) + else if(istype(glasses, /obj/item/clothing/glasses/hud/security)) + glasses:process_hud(src) if (!druggy) see_invisible = 0 - if(istype(glasses, /obj/item/clothing/glasses/sunglasses)) + else if(istype(glasses, /obj/item/clothing/glasses/sunglasses)) see_in_dark = 1 if(istype(glasses, /obj/item/clothing/glasses/sunglasses/sechud)) - if(client) - if(glasses:hud) - glasses:hud:process_hud(src) + if(glasses:hud) + glasses:hud:process_hud(src) if (!druggy) see_invisible = 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 36e3cee295d..13e461c7569 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -96,8 +96,6 @@ return 0 /mob/proc/Life() -// if(organStructure) -// organStructure.ProcessOrgans() return /mob/proc/update_clothing() @@ -172,7 +170,7 @@ var/turf/T = get_turf(loc) if (istype(T)) T.Entered(W) - update_clothing() + update_clothing() return /mob/proc/before_take_item(var/obj/item/item) diff --git a/code/setup.dm b/code/setup.dm index b701acb6118..d84a75d05ec 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -142,7 +142,7 @@ var/MAX_EXPLOSION_RANGE = 14 #define OPENCONTAINER 4096 // is an open container for chemistry purposes -#define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh) +// #define ONESIZEFITSALL 8192 // can be worn by fatties (or children? ugh) #define NOREACT 16384 //Reagents dont' react inside this container. diff --git a/html/changelog.html b/html/changelog.html index c099a42b9ee..e22ae03b0d6 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -67,6 +67,21 @@ should be listed in the changelog upon commit though. Thanks. --> +
+

27 May 2012

+

Abi79 updated:

+ +

Erthilo updated:

+ +
+

26 May 2012

Erthilo updated:

diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 60ba5259430..2f077b367e8 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index cc38ead24c8..61665fe8a65 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ