diff --git a/code/datums/disease.dm b/code/datums/disease.dm index 3ba5a107d1..4412f629e8 100644 --- a/code/datums/disease.dm +++ b/code/datums/disease.dm @@ -19,6 +19,7 @@ to null does not delete the object itself. Thank you. /datum/disease + var/form = "Virus" //During medscans, what the disease is referred to as var/name = "No disease" var/stage = 1 //all diseases start at stage 1 var/max_stages = 0.0 diff --git a/code/defines/mob/living/carbon/carbon.dm b/code/defines/mob/living/carbon/carbon.dm index 51e5867312..d7c7b0355b 100644 --- a/code/defines/mob/living/carbon/carbon.dm +++ b/code/defines/mob/living/carbon/carbon.dm @@ -3,4 +3,5 @@ var/list/stomach_contents = list() var/brain_op_stage = 0.0 - var/eye_op_stage = 0.0 \ No newline at end of file + var/eye_op_stage = 0.0 + var/appendix_op_stage = 0.0 \ No newline at end of file diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 8b1ed588df..84f5ffa277 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -107,6 +107,7 @@ /obj/item/clothing/suit/labcoat/cmo name = "chief medical officer's labcoat" desc = "Bluer than the standard model." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labcoat_cmo_open" item_state = "labcoat_cmo" armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 55, rad = 5) @@ -114,28 +115,33 @@ /obj/item/clothing/suit/labcoat/mad name = "The Mad's labcoat" desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labgreen_open" item_state = "labgreen" /obj/item/clothing/suit/labcoat/genetics name = "Geneticist Labcoat" desc = "A suit that protects against minor chemical spills. Has a blue stripe on the shoulder." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labcoat_gen_open" /obj/item/clothing/suit/labcoat/chemist name = "Chemist Labcoat" desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labcoat_chem_open" /obj/item/clothing/suit/labcoat/virologist name = "Virologist Labcoat" desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labcoat_vir_open" armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 55, rad = 5) /obj/item/clothing/suit/labcoat/science name = "Scientist Labcoat" desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder." + allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen) icon_state = "labcoat_tox_open" /obj/item/clothing/suit/straight_jacket diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm index 90e9e3a3fb..af90108390 100644 --- a/code/defines/obj/decal.dm +++ b/code/defines/obj/decal.dm @@ -237,3 +237,20 @@ density = 0 anchored = 1 layer = 50 + +//Vomit (sorry) +/obj/decal/cleanable/vomit + name = "Vomit" + desc = "Gosh, how unpleasant." + density = 0 + anchored = 1 + layer = 2 + icon = 'blood.dmi' + icon_state = "vomit_1" + random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4") + var/list/viruses = list() + + Del() + for(var/datum/disease/D in viruses) + D.cure(0) + ..() \ No newline at end of file diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index d1239b4f34..7400cd663c 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -432,51 +432,21 @@ containertype = "/obj/crate/secure/gear" containername = "Secruity Barriers crate" -datum/supply_packs/hats/New() - var/list/tempContains = list("/obj/item/clothing/head/collectable/chef", - "/obj/item/clothing/head/collectable/chef", - "/obj/item/clothing/head/collectable/chef", - "/obj/item/clothing/head/collectable/paper", - "/obj/item/clothing/head/collectable/paper", +datum/supply_packs/hats/ + contains = list("/obj/item/clothing/head/collectable/chef", "/obj/item/clothing/head/collectable/paper", "/obj/item/clothing/head/collectable/tophat", - "/obj/item/clothing/head/collectable/tophat", - "/obj/item/clothing/head/collectable/tophat", - "/obj/item/clothing/head/collectable/captain", - "/obj/item/clothing/head/collectable/captain", "/obj/item/clothing/head/collectable/captain", "/obj/item/clothing/head/collectable/beret", - "/obj/item/clothing/head/collectable/beret", - "/obj/item/clothing/head/collectable/beret", - "/obj/item/clothing/head/collectable/welding", - "/obj/item/clothing/head/collectable/welding", "/obj/item/clothing/head/collectable/welding", "/obj/item/clothing/head/collectable/flatcap", - "/obj/item/clothing/head/collectable/flatcap", - "/obj/item/clothing/head/collectable/flatcap", - "/obj/item/clothing/head/collectable/pirate", - "/obj/item/clothing/head/collectable/pirate", "/obj/item/clothing/head/collectable/pirate", "/obj/item/clothing/head/collectable/kitty", - "/obj/item/clothing/head/collectable/kitty", - "/obj/item/clothing/head/collectable/kitty", - "/obj/item/clothing/head/collectable/rabbitears", - "/obj/item/clothing/head/collectable/rabbitears", "/obj/item/clothing/head/collectable/rabbitears", "/obj/item/clothing/head/collectable/wizard", - "/obj/item/clothing/head/collectable/wizard", - "/obj/item/clothing/head/collectable/wizard", - "/obj/item/clothing/head/collectable/hardhat", - "/obj/item/clothing/head/collectable/hardhat", "/obj/item/clothing/head/collectable/hardhat", "/obj/item/clothing/head/collectable/HoS", - "/obj/item/clothing/head/collectable/HoS", - "/obj/item/clothing/head/collectable/HoS", "/obj/item/clothing/head/collectable/thunderdome", - "/obj/item/clothing/head/collectable/thunderdome", - "/obj/item/clothing/head/collectable/thunderdome", - "/obj/item/clothing/head/collectable/swat", - "/obj/item/clothing/head/collectable/swat", "/obj/item/clothing/head/collectable/swat", "/obj/item/clothing/head/collectable/metroid", "/obj/item/clothing/head/collectable/metroid", @@ -487,15 +457,9 @@ datum/supply_packs/hats/New() "/obj/item/clothing/head/collectable/xenom", "/obj/item/clothing/head/collectable/xenom", "/obj/item/clothing/head/collectable/petehat",) - for(var/i = 0,i[] has been hit by [] with []", src, user, W) @@ -136,6 +136,13 @@ src.blood_DNA = list2params(L) return +/atom/proc/add_vomit_floor(mob/living/carbon/M as mob) + if( istype(src, /turf/simulated) ) + var/obj/decal/cleanable/vomit/this = new /obj/decal/cleanable/vomit(src) + for(var/datum/disease/D in M.viruses) + var/datum/disease/newDisease = new D.type + this.viruses += newDisease + newDisease.holder = this // Only adds blood on the floor -- Skie /atom/proc/add_blood_floor(mob/living/carbon/M as mob) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 4b3eaae05b..a413b5c8ad 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -13,7 +13,7 @@ /proc/event() event = 1 - switch(rand(1,11)) + switch(rand(1,12)) if(1) command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") world << sound('meteors.ogg') @@ -89,6 +89,9 @@ if(11) lightsout(1,2) + if(12) + appendicitis() + /proc/dotheblobbaby() if (blobevent) for(var/obj/blob/B in world) @@ -213,6 +216,20 @@ A.power_environ = 1 A.power_change() +/proc/appendicitis() + for(var/mob/living/carbon/human/H in world) + var/foundAlready = 0 // don't infect someone that already has the virus + for(var/datum/disease/D in H.viruses) + foundAlready = 1 + if(H.stat == 2 || foundAlready) + continue + + var/datum/disease/D = new /datum/disease/appendicitis + D.holder = H + D.affected_mob = H + H.viruses += D + break + /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') diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 1528b38a15..f17a20fd48 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -106,6 +106,18 @@ if(istype(O,/obj/item/weapon/melee/baton)) if(O:charges < 10) O:charges += 1 + //Service + if(istype(O,/obj/item/weapon/reagent_containers/food/condiment/enzyme)) + if(O.reagents.get_reagent_amount("enzyme") < 50) + O.reagents.add_reagent("enzyme", 1) + //Medical + if(istype(O,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline)) + if(O.reagents.get_reagent_amount("inaprovaline") < 30) + O.reagents.add_reagent("inaprovaline", 1) + if(istype(O,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin)) + if(O.reagents.get_reagent_amount("anti_toxin") < 30) + O.reagents.add_reagent("anti_toxin", 1) + R.module.respawn_consumable(R) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 2090a3917f..c6a356b096 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -180,7 +180,7 @@ if(usr.stat || usr.restrained()) return - if(istype(usr,/mob/living/silicon)) + if(istype(usr,/mob/living/silicon) && !(usr:module && istype(usr:module,/obj/item/weapon/robot_module/butler)) ) usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!" return diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 8363ab85a6..8653279db1 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -692,7 +692,7 @@ user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) for(var/datum/disease/D in C.viruses) if(!D.hidden[SCANNER]) - user.show_message(text("\red Warning Virus Detected.\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) + user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) if(2) if (!istype(C:dna, /datum/dna) || !isnull(C:gloves)) diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 052f4cbad2..c6ea31a2c5 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -175,7 +175,7 @@ MASS SPECTROMETER user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1) for(var/datum/disease/D in M.viruses) if(!D.hidden[SCANNER]) - user.show_message(text("\red Warning: Virus Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) + user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1) if (M.brainloss >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0) diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index dd8983f484..a2270a0dfc 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -52,54 +52,6 @@ MOP ..() return -/obj/item/weapon/chemsprayer/New() - var/datum/reagents/R = new/datum/reagents(1000) - reagents = R - R.my_atom = src - R.add_reagent("cleaner", 10) - -/obj/item/weapon/chemsprayer/attack(mob/living/carbon/human/M as mob, mob/user as mob) - return - -/obj/item/weapon/chemsprayer/afterattack(atom/A as mob|obj, mob/user as mob) - if (istype(A, /obj/item/weapon/storage/backpack )) - return - else if (src.reagents.total_volume < 1) - user << "\blue Add more cleaner!" - return - - var/obj/decal/D = new/obj/decal(get_turf(src)) - D.name = "chemicals" - D.icon = 'chemical.dmi' - D.icon_state = "chempuff" - D.create_reagents(10) - src.reagents.trans_to(D, 10) - playsound(src.loc, 'spray2.ogg', 50, 1, -6) - - spawn(0) - for(var/i=0, i<6, i++) - step_towards(D,A) - D.reagents.reaction(get_turf(D)) - for(var/atom/T in get_turf(D)) - D.reagents.reaction(T) - sleep(6) - del(D) - - if(isrobot(user)) //Cyborgs can clean forever if they keep charged - var/mob/living/silicon/robot/janitor = user - janitor.cell.charge -= 20 - var/refill = src.reagents.get_master_reagent_id() - spawn(600) - src.reagents.add_reagent(refill, 10) - - return - -/obj/item/weapon/chemsprayer/examine() - set src in usr - usr << text("\icon[] [] units of cleaner left!", src, src.reagents.total_volume) - ..() - return - // MOP /obj/item/weapon/mop/New() @@ -124,7 +76,7 @@ MOP for(var/obj/decal/cleanable/crayon/R in A) del(R) mopcount++ - else if (istype(A, /obj/decal/cleanable/blood) || istype(A, /obj/overlay) || istype(A, /obj/decal/cleanable/xenoblood) || istype(A, /obj/rune) || istype(A,/obj/decal/cleanable/crayon) ) + else if (istype(A, /obj/decal/cleanable/blood) || istype(A, /obj/overlay) || istype(A, /obj/decal/cleanable/xenoblood) || istype(A, /obj/rune) || istype(A,/obj/decal/cleanable/crayon) || istype(A,/obj/decal/cleanable/vomit) ) for(var/mob/O in viewers(user, null)) O.show_message(text("\red [user] begins to clean [A]"), 1) sleep(20) diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index 7d42e0f1c0..6bb17c869f 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -19,6 +19,18 @@ CIRCULAR SAW if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/table/, M.loc) && (M.lying || M.weakened || M.stunned || M.paralysis || M.sleeping || M.stat) && prob(50)))) return ..() + if(user.zone_sel.selecting == "groin") + if(istype(M, /mob/living/carbon/human)) + switch(M:appendix_op_stage) + if(2.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [user] retracts the flap in [M]'s abdomen cut open with [src].", 1) + M << "\red [user] begins to retract the flap in your abdomen with [src]!" + user << "\red You retract the flap in [M]'s abdomen with [src]!" + M:appendix_op_stage = 3.0 + return + if (user.zone_sel.selecting == "eyes") var/mob/living/carbon/human/H = M @@ -80,6 +92,31 @@ CIRCULAR SAW if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/table/, M.loc) && M.lying && prob(50)))) return ..() + if(user.zone_sel.selecting == "groin") + if(istype(M, /mob/living/carbon/human)) + switch(M:appendix_op_stage) + if(1.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [user] is beginning to clamp bleeders in [M]'s abdomen cut open with [src].", 1) + M << "\red [user] begins to clamp bleeders in your abdomen with [src]!" + user << "\red You clamp bleeders in [M]'s abdomen with [src]!" + M:appendix_op_stage = 2.0 + if(4.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [user] is removing [M]'s appendix with [src].", 1) + M << "\red [user] begins to remove your appendix with [src]!" + user << "\red You remove [M]'s appendix with [src]!" + for(var/datum/disease/D in M.viruses) + if(istype(D, /datum/disease/appendicitis)) + new /obj/item/weapon/reagent_containers/food/snacks/appendixinflamed(get_turf(M)) + M:appendix_op_stage = 5.0 + return + new /obj/item/weapon/reagent_containers/food/snacks/appendix(get_turf(M)) + M:appendix_op_stage = 5.0 + return + if (user.zone_sel.selecting == "eyes") var/mob/living/carbon/human/H = M @@ -140,6 +177,21 @@ CIRCULAR SAW if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/table/, M.loc) && M.lying && prob(50)))) return ..() + if(user.zone_sel.selecting == "groin") + if(istype(M, /mob/living/carbon/human)) + switch(M:appendix_op_stage) + if(5.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [user] is beginning to cauterize the incision in [M]'s abdomen with [src].", 1) + M << "\red [user] begins to cauterize the incision in your abdomen with [src]!" + user << "\red You cauterize the incision in [M]'s abdomen with [src]!" + M:appendix_op_stage = 6.0 + for(var/datum/disease/appendicitis in M.viruses) + appendicitis.cure() + M.resistances += appendicitis + return + if (user.zone_sel.selecting == "eyes") var/mob/living/carbon/human/H = M @@ -210,6 +262,25 @@ CIRCULAR SAW src.add_fingerprint(user) + if(user.zone_sel.selecting == "groin") + if(istype(M, /mob/living/carbon/human)) + switch(M:appendix_op_stage) + if(0.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [M] is beginning to have his abdomen cut open with [src] by [user].", 1) + M << "\red [user] begins to cut open your abdomen with [src]!" + user << "\red You cut [M]'s abdomen open with [src]!" + M:appendix_op_stage = 1.0 + if(3.0) + if(M != user) + for(var/mob/O in (viewers(M) - user - M)) + O.show_message("\red [M] is beginning to have his appendix seperated with [src] by [user].", 1) + M << "\red [user] begins to seperate your appendix with [src]!" + user << "\red You seperate [M]'s appendix with [src]!" + M:appendix_op_stage = 4.0 + return + if(user.zone_sel.selecting == "head" || istype(M, /mob/living/carbon/metroid)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/storage/crates.dm b/code/game/objects/storage/crates.dm index 70ec40cdc1..5f45bb1751 100644 --- a/code/game/objects/storage/crates.dm +++ b/code/game/objects/storage/crates.dm @@ -31,6 +31,15 @@ openicon = "trashcartopen" closedicon = "trashcart" +/obj/crate/hat + desc = "A crate filled with Valuable Collector's Hats!." + name = "Hat Crate" + icon = 'storage.dmi' + icon_state = "hat" + density = 1 + openicon = "hatopen" + closedicon = "hat" + /obj/crate/medical desc = "A medical crate." name = "Medical crate" diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 5f58abe1c9..38c49dedc9 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -105,6 +105,24 @@ reagents.add_reagent("nutriment", 3) src.bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/appendix //yes, this is the same as meat. I might do something different in future + name = "Appendix" + desc = "An appendix which looks perfectly healthy." + icon_state = "appendix" + New() + ..() + reagents.add_reagent("nutriment", 3) + src.bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/appendixinflamed + name = "Inflamed Appendix" + desc = "An appendix which appears to be inflamed." + icon_state = "appendixinflamed" + New() + ..() + reagents.add_reagent("nutriment", 1) + src.bitesize = 1 + /obj/item/weapon/reagent_containers/food/snacks/meat/human name = "-meat" var/subjectname = "" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 72ce48afc8..c4601d867c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -61,7 +61,7 @@ if(module) return //var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Janitor", "Service", "Brobot") - var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Miner", "Janitor","Service", "Security") + var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security") if(module) return switch(mod) @@ -91,13 +91,18 @@ icon_state = "Miner" modtype = "Miner" -/* + if("Medical") module = new /obj/item/weapon/robot_module/medical(src) hands.icon_state = "medical" + var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Kent") // icon_state = "MedBot" + if(icontype == "Kent") + icon_state = "toiletbot" + else + icon_state = "robot" modtype = "Med" -*/ + if("Security") module = new /obj/item/weapon/robot_module/security(src) hands.icon_state = "security" diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 80a0d2db10..50d4b1dca8 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -21,10 +21,10 @@ /obj/item/weapon/robot_module/standard name = "standard robot module" -/* + /obj/item/weapon/robot_module/medical name = "medical robot module" -*/ + /obj/item/weapon/robot_module/engineering name = "engineering robot module" @@ -109,21 +109,41 @@ obj/item/weapon/robot_module/syndicate src.modules += O O:amount = 1 -/* +/obj/item/weapon/robot_module/medical/respawn_consumable(var/mob/living/silicon/robot/R) + var/list/what = list ( + /obj/item/weapon/reagent_containers/pill/kelotane, + /obj/item/weapon/reagent_containers/pill/dexalin, + /obj/item/weapon/reagent_containers/pill/cyanide, + ) + for (var/T in what) + if (!(locate(T) in src.modules)) + src.modules -= null + var/O = new T(src) + src.modules += O + O:amount = 1 + + /obj/item/weapon/robot_module/medical/New() ..() src.modules += new /obj/item/device/healthanalyzer(src) - src.modules += new /obj/item/stack/medical/ointment/medbot(src) - src.modules += new /obj/item/stack/medical/bruise_pack/medbot(src) - src.modules += new /obj/item/weapon/reagent_containers/syringe/robot(src) - src.modules += new /obj/item/weapon/scalpel(src) - src.modules += new /obj/item/weapon/circular_saw(src) -*/ + src.modules += new /obj/item/weapon/reagent_containers/syringe(src) + src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) + src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) + src.modules += new /obj/item/weapon/reagent_containers/pill/kelotane(src) + src.modules += new /obj/item/weapon/reagent_containers/pill/dexalin(src) + //commented out due to law 1 + //src.modules += new /obj/item/weapon/scalpel(src) + //src.modules += new /obj/item/weapon/circular_saw(src) + src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) + src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src) + src.emag = new /obj/item/weapon/reagent_containers/pill/cyanide(src) + /obj/item/weapon/robot_module/butler/New() ..() src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src) + src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) src.modules += new /obj/item/weapon/pen(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi index b5012592d6..92e95d713d 100644 Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 3c21336f2e..638da9fd6a 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/tgstation.dme b/tgstation.dme index d6779e42b1..e9d6584b2b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5,145 +5,547 @@ // 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/prop-base" +#define FILE_DIR "code/datums/diseases/.svn/text-base" #define FILE_DIR "code/datums/helper_datums" +#define FILE_DIR "code/datums/helper_datums/.svn" +#define FILE_DIR "code/datums/helper_datums/.svn/text-base" #define FILE_DIR "code/datums/spells" +#define FILE_DIR "code/datums/spells/.svn" +#define FILE_DIR "code/datums/spells/.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/prop-base" +#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/asteroid" +#define FILE_DIR "code/game/asteroid/.svn" +#define FILE_DIR "code/game/asteroid/.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/cult" +#define FILE_DIR "code/game/gamemodes/cult/.svn" +#define FILE_DIR "code/game/gamemodes/cult/.svn/text-base" +#define FILE_DIR "code/game/gamemodes/deathmatch" +#define FILE_DIR "code/game/gamemodes/deathmatch/.svn" #define FILE_DIR "code/game/gamemodes/events" +#define FILE_DIR "code/game/gamemodes/events/.svn" +#define FILE_DIR "code/game/gamemodes/events/.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/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/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/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/prop-base" +#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/kitchen" +#define FILE_DIR "code/game/machinery/kitchen/.svn" +#define FILE_DIR "code/game/machinery/kitchen/.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/prop-base" +#define FILE_DIR "code/game/magic/cultist/.svn/text-base" #define FILE_DIR "code/game/mecha" +#define FILE_DIR "code/game/mecha/.svn" +#define FILE_DIR "code/game/mecha/.svn/prop-base" +#define FILE_DIR "code/game/mecha/.svn/text-base" #define FILE_DIR "code/game/mecha/combat" +#define FILE_DIR "code/game/mecha/combat/.svn" +#define FILE_DIR "code/game/mecha/combat/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment" +#define FILE_DIR "code/game/mecha/equipment/.svn" +#define FILE_DIR "code/game/mecha/equipment/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment/tools" +#define FILE_DIR "code/game/mecha/equipment/tools/.svn" +#define FILE_DIR "code/game/mecha/equipment/tools/.svn/text-base" #define FILE_DIR "code/game/mecha/equipment/weapons" +#define FILE_DIR "code/game/mecha/equipment/weapons/.svn" +#define FILE_DIR "code/game/mecha/equipment/weapons/.svn/text-base" #define FILE_DIR "code/game/mecha/working" +#define FILE_DIR "code/game/mecha/working/.svn" +#define FILE_DIR "code/game/mecha/working/.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/devices/PDA" +#define FILE_DIR "code/game/objects/devices/PDA/.svn" +#define FILE_DIR "code/game/objects/devices/PDA/.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/stacks" +#define FILE_DIR "code/game/objects/stacks/.svn" +#define FILE_DIR "code/game/objects/stacks/.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/research" +#define FILE_DIR "code/game/research/.svn" +#define FILE_DIR "code/game/research/.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/js" +#define FILE_DIR "code/js/.svn" +#define FILE_DIR "code/js/.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/food" +#define FILE_DIR "code/modules/food/.svn" +#define FILE_DIR "code/modules/food/.svn/text-base" +#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/mining" +#define FILE_DIR "code/modules/mining/.svn" +#define FILE_DIR "code/modules/mining/.svn/text-base" #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/humanoid/caste" +#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste/.svn" +#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste/.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/brain" +#define FILE_DIR "code/modules/mob/living/carbon/brain/.svn" +#define FILE_DIR "code/modules/mob/living/carbon/brain/.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/metroid" +#define FILE_DIR "code/modules/mob/living/carbon/metroid/.svn" +#define FILE_DIR "code/modules/mob/living/carbon/metroid/.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/pai" +#define FILE_DIR "code/modules/mob/living/silicon/pai/.svn" +#define FILE_DIR "code/modules/mob/living/silicon/pai/.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/power/singularity" +#define FILE_DIR "code/modules/power/singularity/.svn" +#define FILE_DIR "code/modules/power/singularity/.svn/text-base" #define FILE_DIR "code/modules/power/singularity/particle_accelerator" +#define FILE_DIR "code/modules/power/singularity/particle_accelerator/.svn" +#define FILE_DIR "code/modules/power/singularity/particle_accelerator/.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/gamemodes" +#define FILE_DIR "code/unused/gamemodes/.svn" +#define FILE_DIR "code/unused/gamemodes/.svn/text-base" +#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/experimental" +#define FILE_DIR "code/WorkInProgress/experimental/.svn" +#define FILE_DIR "code/WorkInProgress/experimental/.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/organs" +#define FILE_DIR "code/WorkInProgress/organs/.svn" +#define FILE_DIR "code/WorkInProgress/organs/.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 "data/logs" +#define FILE_DIR "data/logs/2011" +#define FILE_DIR "data/logs/2011/06-June" +#define FILE_DIR "data/logs/2011/07-July" +#define FILE_DIR "data/player_saves" +#define FILE_DIR "data/player_saves/t" +#define FILE_DIR "data/player_saves/t/trubblebass" #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/spideros_icons" +#define FILE_DIR "icons/spideros_icons/.svn" +#define FILE_DIR "icons/spideros_icons/.svn/prop-base" +#define FILE_DIR "icons/spideros_icons/.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/backup" +#define FILE_DIR "maps/.svn" +#define FILE_DIR "maps/.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/bots" +#define FILE_DIR "sound/bots/.svn" +#define FILE_DIR "sound/bots/.svn/prop-base" +#define FILE_DIR "sound/bots/.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/spells" +#define FILE_DIR "sound/spells/.svn" +#define FILE_DIR "sound/spells/.svn/prop-base" +#define FILE_DIR "sound/spells/.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 #define DEBUG