diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 395b0c16d37..0875f19fd44 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -43,7 +43,7 @@ STI KALY - blind return if(prob(2)) affected_mob << "\red You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")]." - if(prob(5)) + /* if(prob(5)) var/list/theareas = new/list() for(var/area/AR in world) @@ -73,8 +73,8 @@ STI KALY - blind affected_mob.loc = pick(L) smoke.start() - - return +//Apparently it created a lagspike every time it was called -- Urist + return */ return diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index a5924b6b3f2..a2edc67510d 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -340,7 +340,7 @@ gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 -/obj/item/clothing/mask/clown_hat +/obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" desc = "You're gay for even considering wearing this." icon_state = "clown" @@ -955,3 +955,14 @@ /obj/item/clothing/under/shorts/grey icon_state = "greyshorts" color = "greyshorts" + +// Belt slot clothing (only suspenders for now, because utility belt is a storage item) +/obj/item/clothing/belt + name = "belt" + icon = 'belts.dmi' + flags = FPRINT | TABLEPASS | ONBELT + +/obj/item/clothing/belt/suspenders + name = "suspenders" + desc = "They suspend the illusion of the mime's play." //Meh -- Urist + icon_state = "suspenders" diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index c6f994b44eb..1ff3745a8d9 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -1,7 +1,7 @@ /obj/item/weapon/storage/utilitybelt name = "utility belt" desc = "Can hold various tools." - icon = 'old_or_unused.dmi' + icon = 'belts.dmi' icon_state = "utilitybelt" item_state = "utility" can_hold = list("/obj/item/weapon/crowbar","/obj/item/weapon/screwdriver","/obj/item/weapon/weldingtool","/obj/item/weapon/wirecutters","/obj/item/weapon/wrench","/obj/item/device/multitool","/obj/item/device/flashlight","/obj/item/weapon/cable_coil") diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 2b642f65b95..66af86d1b53 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -230,10 +230,30 @@ A.power_environ = 1 A.power_change() -/proc/viral_outbreak() +/proc/viral_outbreak(var/virus = null) command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('outbreak7.ogg') - var/virus_type = pick(/datum/disease/dnaspread,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis) + var/virus_type + if(!virus) + virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/wizarditis) + else + switch(virus) + if("fake gbs") + virus_type = /datum/disease/fake_gbs + if("gbs") + virus_type = /datum/disease/gbs + if("magnitis") + virus_type = /datum/disease/magnitis + if("wizarditis") + virus_type = /datum/disease/wizarditis + if("brain rot") + virus_type = /datum/disease/brainrot + if("cold") + virus_type = /datum/disease/cold + if("rhinovirus") + virus_type = /datum/disease/dnaspread + if("flu") + virus_type = /datum/disease/flu for(var/mob/living/carbon/human/H in world) if((H.virus) || (H.stat == 2)) continue diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 49cec8e050c..918d02b54f7 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -303,19 +303,20 @@ src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/clown(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes) - src.equip_if_possible(new /obj/item/clothing/mask/clown_hat(src), slot_wear_mask) + src.equip_if_possible(new /obj/item/clothing/mask/gas/clown_hat(src), slot_wear_mask) src.equip_if_possible(new /obj/item/weapon/banana(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack) src.mutations |= 16 if ("Mime") src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back) - src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_r_store) src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves) src.equip_if_possible(new /obj/item/clothing/mask/mime(src), slot_wear_mask) src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head) + src.equip_if_possible(new /obj/item/clothing/belt/suspenders(src), slot_belt) src.verbs += /client/proc/mimespeak src.verbs += /client/proc/mimewall src.miming = 1 diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 972550b857d..33a110a6c9a 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -153,8 +153,9 @@ var/supply_shuttle_points = 50 "/obj/item/weapon/storage/firstaid/syringes", "/obj/item/weapon/storage/beakerbox") cost = 20 - containertype = "/obj/crate/freezer" + containertype = "/obj/crate/secure/weapon" containername = "Virus crate" + access = access_heads /datum/supply_packs/janitor diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 667c1ac62be..ed70858673f 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1123,8 +1123,14 @@ var/showadminmessages = 1 alien_infestation() message_admins("[key_name_admin(usr)] has spawned aliens", 1) if("virus") - viral_outbreak() - message_admins("[key_name_admin(usr)] has spawned a virus outbreak", 1) + if(alert("Do you want this to be a random disease or do you have something in mind?",,"Random","Choose")=="Random") + viral_outbreak() + message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1) + else + var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","rhinovirus","flu") + var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses + viral_outbreak(V) + message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1) if("retardify") if (src.rank in list("Shit Guy", "Coder", "Host")) for(var/mob/living/carbon/human/H in world) @@ -1161,7 +1167,7 @@ var/showadminmessages = 1 if("dorf") if (src.rank in list("Shit Guy","Coder", "Host")) for(var/mob/living/carbon/human/B in world) - B.face_icon_state = "facial_longbeard" + B.face_icon_state = "facial_wise" B.update_face() message_admins("[key_name_admin(usr)] activated dorf mode") else @@ -1494,7 +1500,7 @@ var/showadminmessages = 1 Spawn wormholes (Untested)
Spawn magma(Untested)
Trigger an Alien infestation
-Trigger an Virus Outbreak
+Trigger a Virus Outbreak
Ghost Mode
Remove all urine/poo from station
Make all players retarded
diff --git a/goonstation.dme b/goonstation.dme index d174fb8ef3a..44a6e383606 100644 --- a/goonstation.dme +++ b/goonstation.dme @@ -6,451 +6,120 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR ".svn" -#define FILE_DIR ".svn/prop-base" -#define FILE_DIR ".svn/text-base" -#define FILE_DIR ".svn/tmp" #define FILE_DIR "code" -#define FILE_DIR "code/.svn" -#define FILE_DIR "code/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS" -#define FILE_DIR "code/ATMOSPHERICS/.svn" -#define FILE_DIR "code/ATMOSPHERICS/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components" -#define FILE_DIR "code/ATMOSPHERICS/components/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components/binary_devices" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices/.svn/text-base" #define FILE_DIR "code/ATMOSPHERICS/components/unary" -#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn" -#define FILE_DIR "code/ATMOSPHERICS/components/unary/.svn/text-base" -#define FILE_DIR "code/atoms" -#define FILE_DIR "code/atoms/.svn" -#define FILE_DIR "code/atoms/clothing" -#define FILE_DIR "code/atoms/clothing/.svn" -#define FILE_DIR "code/atoms/mob" -#define FILE_DIR "code/atoms/mob/.svn" -#define FILE_DIR "code/atoms/mob/living" -#define FILE_DIR "code/atoms/mob/living/.svn" -#define FILE_DIR "code/atoms/mob/living/sapien" -#define FILE_DIR "code/atoms/mob/living/sapien/.svn" -#define FILE_DIR "code/atoms/objects" -#define FILE_DIR "code/atoms/objects/.svn" -#define FILE_DIR "code/atoms/objects/radio" -#define FILE_DIR "code/atoms/objects/radio/.svn" -#define FILE_DIR "code/atoms/objects/storage" -#define FILE_DIR "code/atoms/objects/storage/.svn" #define FILE_DIR "code/datums" -#define FILE_DIR "code/datums/.svn" -#define FILE_DIR "code/datums/.svn/text-base" #define FILE_DIR "code/datums/diseases" -#define FILE_DIR "code/datums/diseases/.svn" -#define FILE_DIR "code/datums/diseases/.svn/text-base" #define FILE_DIR "code/defines" -#define FILE_DIR "code/defines/.svn" -#define FILE_DIR "code/defines/.svn/text-base" #define FILE_DIR "code/defines/area" -#define FILE_DIR "code/defines/area/.svn" -#define FILE_DIR "code/defines/area/.svn/text-base" #define FILE_DIR "code/defines/mob" -#define FILE_DIR "code/defines/mob/.svn" -#define FILE_DIR "code/defines/mob/.svn/text-base" #define FILE_DIR "code/defines/mob/dead" -#define FILE_DIR "code/defines/mob/dead/.svn" -#define FILE_DIR "code/defines/mob/dead/.svn/text-base" #define FILE_DIR "code/defines/mob/living" -#define FILE_DIR "code/defines/mob/living/.svn" -#define FILE_DIR "code/defines/mob/living/.svn/text-base" #define FILE_DIR "code/defines/mob/living/carbon" -#define FILE_DIR "code/defines/mob/living/carbon/.svn" -#define FILE_DIR "code/defines/mob/living/carbon/.svn/text-base" #define FILE_DIR "code/defines/mob/living/silicon" -#define FILE_DIR "code/defines/mob/living/silicon/.svn" -#define FILE_DIR "code/defines/mob/living/silicon/.svn/text-base" #define FILE_DIR "code/defines/obj" -#define FILE_DIR "code/defines/obj/.svn" -#define FILE_DIR "code/defines/obj/.svn/text-base" #define FILE_DIR "code/defines/obj/clothing" -#define FILE_DIR "code/defines/obj/clothing/.svn" -#define FILE_DIR "code/defines/obj/clothing/.svn/text-base" #define FILE_DIR "code/defines/obj/spawner" -#define FILE_DIR "code/defines/obj/spawner/.svn" -#define FILE_DIR "code/defines/obj/spawner/.svn/text-base" #define FILE_DIR "code/defines/procs" -#define FILE_DIR "code/defines/procs/.svn" -#define FILE_DIR "code/defines/procs/.svn/text-base" -#define FILE_DIR "code/defines/turf" -#define FILE_DIR "code/defines/turf/.svn" #define FILE_DIR "code/FEA" -#define FILE_DIR "code/FEA/.svn" -#define FILE_DIR "code/FEA/.svn/text-base" #define FILE_DIR "code/game" -#define FILE_DIR "code/game/.svn" -#define FILE_DIR "code/game/.svn/text-base" #define FILE_DIR "code/game/area" -#define FILE_DIR "code/game/area/.svn" -#define FILE_DIR "code/game/area/.svn/text-base" #define FILE_DIR "code/game/gamemodes" -#define FILE_DIR "code/game/gamemodes/.svn" -#define FILE_DIR "code/game/gamemodes/.svn/text-base" #define FILE_DIR "code/game/gamemodes/blob" -#define FILE_DIR "code/game/gamemodes/blob/.svn" -#define FILE_DIR "code/game/gamemodes/blob/.svn/text-base" #define FILE_DIR "code/game/gamemodes/changeling" -#define FILE_DIR "code/game/gamemodes/changeling/.svn" -#define FILE_DIR "code/game/gamemodes/changeling/.svn/text-base" #define FILE_DIR "code/game/gamemodes/ctf" -#define FILE_DIR "code/game/gamemodes/ctf/.svn" -#define FILE_DIR "code/game/gamemodes/ctf/.svn/text-base" #define FILE_DIR "code/game/gamemodes/deathmatch" -#define FILE_DIR "code/game/gamemodes/deathmatch/.svn" -#define FILE_DIR "code/game/gamemodes/deathmatch/.svn/text-base" #define FILE_DIR "code/game/gamemodes/extended" -#define FILE_DIR "code/game/gamemodes/extended/.svn" -#define FILE_DIR "code/game/gamemodes/extended/.svn/text-base" #define FILE_DIR "code/game/gamemodes/malfunction" -#define FILE_DIR "code/game/gamemodes/malfunction/.svn" -#define FILE_DIR "code/game/gamemodes/malfunction/.svn/text-base" #define FILE_DIR "code/game/gamemodes/meteor" -#define FILE_DIR "code/game/gamemodes/meteor/.svn" -#define FILE_DIR "code/game/gamemodes/meteor/.svn/text-base" #define FILE_DIR "code/game/gamemodes/monkey" -#define FILE_DIR "code/game/gamemodes/monkey/.svn" -#define FILE_DIR "code/game/gamemodes/monkey/.svn/text-base" #define FILE_DIR "code/game/gamemodes/nuclear" -#define FILE_DIR "code/game/gamemodes/nuclear/.svn" -#define FILE_DIR "code/game/gamemodes/nuclear/.svn/text-base" #define FILE_DIR "code/game/gamemodes/restructuring" -#define FILE_DIR "code/game/gamemodes/restructuring/.svn" -#define FILE_DIR "code/game/gamemodes/restructuring/.svn/text-base" #define FILE_DIR "code/game/gamemodes/revolution" -#define FILE_DIR "code/game/gamemodes/revolution/.svn" -#define FILE_DIR "code/game/gamemodes/revolution/.svn/text-base" #define FILE_DIR "code/game/gamemodes/ruby" -#define FILE_DIR "code/game/gamemodes/ruby/.svn" -#define FILE_DIR "code/game/gamemodes/ruby/.svn/text-base" #define FILE_DIR "code/game/gamemodes/sandbox" -#define FILE_DIR "code/game/gamemodes/sandbox/.svn" -#define FILE_DIR "code/game/gamemodes/sandbox/.svn/text-base" #define FILE_DIR "code/game/gamemodes/traitor" -#define FILE_DIR "code/game/gamemodes/traitor/.svn" -#define FILE_DIR "code/game/gamemodes/traitor/.svn/text-base" #define FILE_DIR "code/game/gamemodes/wizard" -#define FILE_DIR "code/game/gamemodes/wizard/.svn" -#define FILE_DIR "code/game/gamemodes/wizard/.svn/text-base" #define FILE_DIR "code/game/jobs" -#define FILE_DIR "code/game/jobs/.svn" -#define FILE_DIR "code/game/jobs/.svn/text-base" #define FILE_DIR "code/game/machinery" -#define FILE_DIR "code/game/machinery/.svn" -#define FILE_DIR "code/game/machinery/.svn/text-base" -#define FILE_DIR "code/game/machinery/antimatter_engine" -#define FILE_DIR "code/game/machinery/antimatter_engine/.svn" #define FILE_DIR "code/game/machinery/atmoalter" -#define FILE_DIR "code/game/machinery/atmoalter/.svn" -#define FILE_DIR "code/game/machinery/atmoalter/.svn/text-base" #define FILE_DIR "code/game/machinery/bots" -#define FILE_DIR "code/game/machinery/bots/.svn" -#define FILE_DIR "code/game/machinery/bots/.svn/text-base" #define FILE_DIR "code/game/machinery/computer" -#define FILE_DIR "code/game/machinery/computer/.svn" -#define FILE_DIR "code/game/machinery/computer/.svn/text-base" #define FILE_DIR "code/game/machinery/doors" -#define FILE_DIR "code/game/machinery/doors/.svn" -#define FILE_DIR "code/game/machinery/doors/.svn/text-base" #define FILE_DIR "code/game/machinery/embedded_controller" -#define FILE_DIR "code/game/machinery/embedded_controller/.svn" -#define FILE_DIR "code/game/machinery/embedded_controller/.svn/text-base" #define FILE_DIR "code/game/machinery/pipe" -#define FILE_DIR "code/game/machinery/pipe/.svn" -#define FILE_DIR "code/game/machinery/pipe/.svn/text-base" -#define FILE_DIR "code/game/machinery/power" -#define FILE_DIR "code/game/machinery/power/.svn" #define FILE_DIR "code/game/magic" -#define FILE_DIR "code/game/magic/.svn" -#define FILE_DIR "code/game/magic/.svn/text-base" #define FILE_DIR "code/game/magic/cultist" -#define FILE_DIR "code/game/magic/cultist/.svn" -#define FILE_DIR "code/game/magic/cultist/.svn/text-base" #define FILE_DIR "code/game/objects" -#define FILE_DIR "code/game/objects/.svn" -#define FILE_DIR "code/game/objects/.svn/text-base" #define FILE_DIR "code/game/objects/alien" -#define FILE_DIR "code/game/objects/alien/.svn" -#define FILE_DIR "code/game/objects/alien/.svn/text-base" #define FILE_DIR "code/game/objects/closets" -#define FILE_DIR "code/game/objects/closets/.svn" -#define FILE_DIR "code/game/objects/closets/.svn/text-base" #define FILE_DIR "code/game/objects/closets/secure" -#define FILE_DIR "code/game/objects/closets/secure/.svn" -#define FILE_DIR "code/game/objects/closets/secure/.svn/text-base" #define FILE_DIR "code/game/objects/devices" -#define FILE_DIR "code/game/objects/devices/.svn" -#define FILE_DIR "code/game/objects/devices/.svn/text-base" #define FILE_DIR "code/game/objects/items" -#define FILE_DIR "code/game/objects/items/.svn" -#define FILE_DIR "code/game/objects/items/.svn/text-base" #define FILE_DIR "code/game/objects/items/weapons" -#define FILE_DIR "code/game/objects/items/weapons/.svn" -#define FILE_DIR "code/game/objects/items/weapons/.svn/text-base" #define FILE_DIR "code/game/objects/radio" -#define FILE_DIR "code/game/objects/radio/.svn" -#define FILE_DIR "code/game/objects/radio/.svn/text-base" #define FILE_DIR "code/game/objects/secstorage" -#define FILE_DIR "code/game/objects/secstorage/.svn" -#define FILE_DIR "code/game/objects/secstorage/.svn/text-base" #define FILE_DIR "code/game/objects/spawners" -#define FILE_DIR "code/game/objects/spawners/.svn" -#define FILE_DIR "code/game/objects/spawners/.svn/text-base" #define FILE_DIR "code/game/objects/storage" -#define FILE_DIR "code/game/objects/storage/.svn" -#define FILE_DIR "code/game/objects/storage/.svn/text-base" #define FILE_DIR "code/game/spacecraft" -#define FILE_DIR "code/game/spacecraft/.svn" -#define FILE_DIR "code/game/spacecraft/.svn/text-base" #define FILE_DIR "code/game/verbs" -#define FILE_DIR "code/game/verbs/.svn" -#define FILE_DIR "code/game/verbs/.svn/text-base" #define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/.svn" #define FILE_DIR "code/modules/admin" -#define FILE_DIR "code/modules/admin/.svn" -#define FILE_DIR "code/modules/admin/.svn/text-base" #define FILE_DIR "code/modules/admin/verbs" -#define FILE_DIR "code/modules/admin/verbs/.svn" -#define FILE_DIR "code/modules/admin/verbs/.svn/text-base" -#define FILE_DIR "code/modules/assembly" -#define FILE_DIR "code/modules/assembly/.svn" -#define FILE_DIR "code/modules/ban" -#define FILE_DIR "code/modules/ban/.svn" -#define FILE_DIR "code/modules/build" -#define FILE_DIR "code/modules/build/.svn" -#define FILE_DIR "code/modules/chemical" -#define FILE_DIR "code/modules/chemical/.svn" -#define FILE_DIR "code/modules/combat" -#define FILE_DIR "code/modules/combat/.svn" -#define FILE_DIR "code/modules/combat/guns" -#define FILE_DIR "code/modules/combat/guns/.svn" -#define FILE_DIR "code/modules/computer" -#define FILE_DIR "code/modules/computer/.svn" -#define FILE_DIR "code/modules/door" -#define FILE_DIR "code/modules/door/.svn" -#define FILE_DIR "code/modules/gas" -#define FILE_DIR "code/modules/gas/.svn" -#define FILE_DIR "code/modules/genetic" -#define FILE_DIR "code/modules/genetic/.svn" -#define FILE_DIR "code/modules/hud" -#define FILE_DIR "code/modules/hud/.svn" -#define FILE_DIR "code/modules/login" -#define FILE_DIR "code/modules/login/.svn" -#define FILE_DIR "code/modules/medical" -#define FILE_DIR "code/modules/medical/.svn" #define FILE_DIR "code/modules/mob" -#define FILE_DIR "code/modules/mob/.svn" -#define FILE_DIR "code/modules/mob/.svn/text-base" #define FILE_DIR "code/modules/mob/dead" -#define FILE_DIR "code/modules/mob/dead/.svn" #define FILE_DIR "code/modules/mob/dead/observer" -#define FILE_DIR "code/modules/mob/dead/observer/.svn" -#define FILE_DIR "code/modules/mob/dead/observer/.svn/text-base" #define FILE_DIR "code/modules/mob/living" -#define FILE_DIR "code/modules/mob/living/.svn" -#define FILE_DIR "code/modules/mob/living/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon" -#define FILE_DIR "code/modules/mob/living/carbon/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien" -#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/alien/larva" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/alien/larva/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/beast" -#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/beast/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/human" -#define FILE_DIR "code/modules/mob/living/carbon/human/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/human/.svn/text-base" #define FILE_DIR "code/modules/mob/living/carbon/monkey" -#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn" -#define FILE_DIR "code/modules/mob/living/carbon/monkey/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon" -#define FILE_DIR "code/modules/mob/living/silicon/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/ai" -#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/ai/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/decoy" -#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/decoy/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/hivebot" -#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/hivebot/.svn/text-base" #define FILE_DIR "code/modules/mob/living/silicon/robot" -#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn" -#define FILE_DIR "code/modules/mob/living/silicon/robot/.svn/text-base" #define FILE_DIR "code/modules/mob/new_player" -#define FILE_DIR "code/modules/mob/new_player/.svn" -#define FILE_DIR "code/modules/mob/new_player/.svn/text-base" #define FILE_DIR "code/modules/power" -#define FILE_DIR "code/modules/power/.svn" -#define FILE_DIR "code/modules/power/.svn/text-base" #define FILE_DIR "code/modules/power/antimatter" -#define FILE_DIR "code/modules/power/antimatter/.svn" -#define FILE_DIR "code/modules/power/antimatter/.svn/text-base" -#define FILE_DIR "code/modules/radio" -#define FILE_DIR "code/modules/radio/.svn" -#define FILE_DIR "code/modules/shuttle" -#define FILE_DIR "code/modules/shuttle/.svn" #define FILE_DIR "code/unused" -#define FILE_DIR "code/unused/.svn" -#define FILE_DIR "code/unused/.svn/text-base" -#define FILE_DIR "code/unused/game" -#define FILE_DIR "code/unused/game/.svn" -#define FILE_DIR "code/unused/game/verbs" -#define FILE_DIR "code/unused/game/verbs/.svn" -#define FILE_DIR "code/unused/modules" -#define FILE_DIR "code/unused/modules/.svn" -#define FILE_DIR "code/unused/modules/admin" -#define FILE_DIR "code/unused/modules/admin/.svn" #define FILE_DIR "code/WorkInProgress" -#define FILE_DIR "code/WorkInProgress/.svn" -#define FILE_DIR "code/WorkInProgress/.svn/text-base" #define FILE_DIR "code/WorkInProgress/computer2" -#define FILE_DIR "code/WorkInProgress/computer2/.svn" -#define FILE_DIR "code/WorkInProgress/computer2/.svn/text-base" #define FILE_DIR "code/WorkInProgress/optics" -#define FILE_DIR "code/WorkInProgress/optics/.svn" -#define FILE_DIR "code/WorkInProgress/optics/.svn/text-base" #define FILE_DIR "code/WorkInProgress/pda2" -#define FILE_DIR "code/WorkInProgress/pda2/.svn" -#define FILE_DIR "code/WorkInProgress/pda2/.svn/text-base" #define FILE_DIR "code/WorkInProgress/recycling" -#define FILE_DIR "code/WorkInProgress/recycling/.svn" -#define FILE_DIR "code/WorkInProgress/recycling/.svn/text-base" -#define FILE_DIR "config" -#define FILE_DIR "config/.svn" -#define FILE_DIR "config/.svn/text-base" -#define FILE_DIR "config/names" -#define FILE_DIR "config/names/.svn" -#define FILE_DIR "config/names/.svn/text-base" -#define FILE_DIR "data" -#define FILE_DIR "data/.svn" -#define FILE_DIR "data/.svn/text-base" #define FILE_DIR "icons" -#define FILE_DIR "icons/.svn" -#define FILE_DIR "icons/.svn/prop-base" -#define FILE_DIR "icons/.svn/text-base" #define FILE_DIR "icons/effects" -#define FILE_DIR "icons/effects/.svn" -#define FILE_DIR "icons/effects/.svn/prop-base" -#define FILE_DIR "icons/effects/.svn/text-base" #define FILE_DIR "icons/misc" -#define FILE_DIR "icons/misc/.svn" -#define FILE_DIR "icons/misc/.svn/prop-base" -#define FILE_DIR "icons/misc/.svn/text-base" #define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/.svn" -#define FILE_DIR "icons/mob/.svn/prop-base" -#define FILE_DIR "icons/mob/.svn/text-base" #define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/.svn" -#define FILE_DIR "icons/obj/.svn/prop-base" -#define FILE_DIR "icons/obj/.svn/text-base" #define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/.svn" -#define FILE_DIR "icons/obj/atmospherics/.svn/prop-base" -#define FILE_DIR "icons/obj/atmospherics/.svn/text-base" #define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/clothing/.svn" -#define FILE_DIR "icons/obj/clothing/.svn/prop-base" -#define FILE_DIR "icons/obj/clothing/.svn/text-base" #define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/doors/.svn" -#define FILE_DIR "icons/obj/doors/.svn/prop-base" -#define FILE_DIR "icons/obj/doors/.svn/text-base" #define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/machines/.svn" -#define FILE_DIR "icons/obj/machines/.svn/prop-base" -#define FILE_DIR "icons/obj/machines/.svn/text-base" #define FILE_DIR "icons/obj/pipes" -#define FILE_DIR "icons/obj/pipes/.svn" -#define FILE_DIR "icons/obj/pipes/.svn/prop-base" -#define FILE_DIR "icons/obj/pipes/.svn/text-base" #define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/pda_icons/.svn" -#define FILE_DIR "icons/pda_icons/.svn/prop-base" -#define FILE_DIR "icons/pda_icons/.svn/text-base" -#define FILE_DIR "icons/PSD files" -#define FILE_DIR "icons/PSD files/.svn" -#define FILE_DIR "icons/PSD files/.svn/prop-base" -#define FILE_DIR "icons/PSD files/.svn/text-base" #define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/Testing/.svn" -#define FILE_DIR "icons/Testing/.svn/prop-base" -#define FILE_DIR "icons/Testing/.svn/text-base" #define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/.svn" -#define FILE_DIR "icons/turf/.svn/prop-base" -#define FILE_DIR "icons/turf/.svn/text-base" #define FILE_DIR "interface" -#define FILE_DIR "interface/.svn" -#define FILE_DIR "interface/.svn/text-base" #define FILE_DIR "maps" -#define FILE_DIR "maps/.svn" -#define FILE_DIR "maps/.svn/prop-base" -#define FILE_DIR "maps/.svn/text-base" #define FILE_DIR "maps/backup" -#define FILE_DIR "maps/backup/.svn" -#define FILE_DIR "maps/backup/.svn/text-base" -#define FILE_DIR "music" -#define FILE_DIR "music/.svn" -#define FILE_DIR "music/.svn/text-base" #define FILE_DIR "sound" -#define FILE_DIR "sound/.svn" #define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/ambience/.svn" -#define FILE_DIR "sound/ambience/.svn/prop-base" -#define FILE_DIR "sound/ambience/.svn/text-base" #define FILE_DIR "sound/announcer" -#define FILE_DIR "sound/announcer/.svn" -#define FILE_DIR "sound/announcer/.svn/prop-base" -#define FILE_DIR "sound/announcer/.svn/text-base" #define FILE_DIR "sound/effects" -#define FILE_DIR "sound/effects/.svn" -#define FILE_DIR "sound/effects/.svn/prop-base" -#define FILE_DIR "sound/effects/.svn/text-base" #define FILE_DIR "sound/items" -#define FILE_DIR "sound/items/.svn" -#define FILE_DIR "sound/items/.svn/prop-base" -#define FILE_DIR "sound/items/.svn/text-base" #define FILE_DIR "sound/machines" -#define FILE_DIR "sound/machines/.svn" -#define FILE_DIR "sound/machines/.svn/prop-base" -#define FILE_DIR "sound/machines/.svn/text-base" #define FILE_DIR "sound/misc" -#define FILE_DIR "sound/misc/.svn" -#define FILE_DIR "sound/misc/.svn/prop-base" -#define FILE_DIR "sound/misc/.svn/text-base" #define FILE_DIR "sound/piano" -#define FILE_DIR "sound/piano/.svn" -#define FILE_DIR "sound/piano/.svn/prop-base" -#define FILE_DIR "sound/piano/.svn/text-base" #define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/.svn" -#define FILE_DIR "sound/voice/.svn/prop-base" -#define FILE_DIR "sound/voice/.svn/text-base" #define FILE_DIR "sound/weapons" -#define FILE_DIR "sound/weapons/.svn" -#define FILE_DIR "sound/weapons/.svn/prop-base" -#define FILE_DIR "sound/weapons/.svn/text-base" -#define FILE_DIR "SQL" -#define FILE_DIR "SQL/.svn" -#define FILE_DIR "SQL/.svn/text-base" // END_FILE_DIR // BEGIN_PREFERENCES diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 09349ebea11..b1c7aa4d3b8 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index ffd6d5119d0..3b07941eecf 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ