diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3f5b9cf3bd2..64efaf999f7 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -54,7 +54,9 @@ New() ..() + src.modules += new /obj/item/borg/sight/hud/med(src) src.modules += new /obj/item/device/healthanalyzer(src) + for(var/i = 1 to 3) var/obj/item/weapon/reagent_containers/syringe/S = new /obj/item/weapon/reagent_containers/syringe(src) switch(i) @@ -67,14 +69,13 @@ src.modules += new /obj/item/weapon/reagent_containers/syringe(src) src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/robot/inaprovaline(src) src.modules += new /obj/item/weapon/reagent_containers/glass/bottle/robot/antitoxin(src) + src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src) + src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) + src.emag = new /obj/item/weapon/reagent_containers/pill/cyanide(src) src.modules += new /obj/item/weapon/reagent_containers/pill/dexalin(src) src.modules += new /obj/item/weapon/reagent_containers/pill/antitox(src) src.modules += new /obj/item/weapon/reagent_containers/pill/kelotane(src) src.modules += new /obj/item/weapon/reagent_containers/pill/bicardine(src) - src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) - src.modules += new /obj/item/weapon/reagent_containers/glass/beaker(src) - src.modules += new /obj/item/borg/sight/hud/med(src) - src.emag = new /obj/item/weapon/reagent_containers/pill/cyanide(src) return @@ -102,17 +103,19 @@ New() ..() - src.modules += new /obj/item/weapon/extinguisher(src) - src.modules += new /obj/item/weapon/screwdriver(src) - src.modules += new /obj/item/weapon/weldingtool/largetank(src) - src.modules += new /obj/item/weapon/wrench(src) - src.modules += new /obj/item/device/analyzer(src) - src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/borg/sight/meson(src) + src.emag = new /obj/item/borg/stun(src) src.modules += new /obj/item/borg/rcd(src) - src.modules += new /obj/item/device/t_scanner(src) + src.modules += new /obj/item/weapon/extinguisher(src) + src.modules += new /obj/item/device/flashlight(src) + src.modules += new /obj/item/weapon/weldingtool/largetank(src) + src.modules += new /obj/item/weapon/screwdriver(src) + src.modules += new /obj/item/weapon/wrench(src) src.modules += new /obj/item/weapon/crowbar(src) src.modules += new /obj/item/weapon/wirecutters(src) src.modules += new /obj/item/device/multitool(src) + src.modules += new /obj/item/device/t_scanner(src) + src.modules += new /obj/item/device/analyzer(src) var/obj/item/stack/sheet/metal/cyborg/M = new /obj/item/stack/sheet/metal/cyborg(src) M.amount = 50 @@ -126,8 +129,6 @@ W.amount = 50 src.modules += W - src.modules += new /obj/item/borg/sight/meson(src) - src.emag = new /obj/item/borg/stun(src) return @@ -153,10 +154,10 @@ New() ..() - src.modules += new /obj/item/weapon/melee/baton(src) - src.modules += new /obj/item/weapon/handcuffs/cyborg(src) - src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src) src.modules += new /obj/item/borg/sight/hud/sec(src) + src.modules += new /obj/item/weapon/handcuffs/cyborg(src) + src.modules += new /obj/item/weapon/melee/baton(src) + src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src) src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) return @@ -172,6 +173,7 @@ src.modules += new /obj/item/weapon/mop(src) src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src) src.emag = new /obj/item/weapon/cleaner(src) + var/datum/reagents/R = new/datum/reagents(1000) src.emag.reagents = R R.my_atom = src.emag @@ -194,6 +196,7 @@ var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 src.modules += M + src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) var/obj/item/weapon/zippo/L = new /obj/item/weapon/zippo(src) @@ -203,6 +206,7 @@ src.modules += new /obj/item/weapon/tray(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) src.emag = new /obj/item/weapon/reagent_containers/food/drinks/beer(src) + var/datum/reagents/R = new/datum/reagents(50) src.emag.reagents = R R.my_atom = src.emag @@ -218,11 +222,11 @@ New() ..() - src.modules += new /obj/item/weapon/pickaxe/jackhammer(src) - src.modules += new /obj/item/weapon/shovel(src) - src.modules += new /obj/item/weapon/satchel(src) src.modules += new /obj/item/borg/sight/meson(src) src.emag = new /obj/item/borg/stun(src) + src.modules += new /obj/item/weapon/satchel(src) + src.modules += new /obj/item/weapon/pickaxe/jackhammer(src) + src.modules += new /obj/item/weapon/shovel(src) return diff --git a/tgstation.dme b/tgstation.dme index 2c3fe59dedb..223245f439e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5,6 +5,264 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR ".svn" +#define FILE_DIR ".svn/pristine" +#define FILE_DIR ".svn/pristine/00" +#define FILE_DIR ".svn/pristine/01" +#define FILE_DIR ".svn/pristine/02" +#define FILE_DIR ".svn/pristine/03" +#define FILE_DIR ".svn/pristine/04" +#define FILE_DIR ".svn/pristine/05" +#define FILE_DIR ".svn/pristine/06" +#define FILE_DIR ".svn/pristine/07" +#define FILE_DIR ".svn/pristine/08" +#define FILE_DIR ".svn/pristine/09" +#define FILE_DIR ".svn/pristine/0a" +#define FILE_DIR ".svn/pristine/0b" +#define FILE_DIR ".svn/pristine/0c" +#define FILE_DIR ".svn/pristine/0d" +#define FILE_DIR ".svn/pristine/0e" +#define FILE_DIR ".svn/pristine/0f" +#define FILE_DIR ".svn/pristine/10" +#define FILE_DIR ".svn/pristine/11" +#define FILE_DIR ".svn/pristine/12" +#define FILE_DIR ".svn/pristine/13" +#define FILE_DIR ".svn/pristine/14" +#define FILE_DIR ".svn/pristine/15" +#define FILE_DIR ".svn/pristine/16" +#define FILE_DIR ".svn/pristine/17" +#define FILE_DIR ".svn/pristine/18" +#define FILE_DIR ".svn/pristine/19" +#define FILE_DIR ".svn/pristine/1a" +#define FILE_DIR ".svn/pristine/1b" +#define FILE_DIR ".svn/pristine/1c" +#define FILE_DIR ".svn/pristine/1d" +#define FILE_DIR ".svn/pristine/1e" +#define FILE_DIR ".svn/pristine/1f" +#define FILE_DIR ".svn/pristine/20" +#define FILE_DIR ".svn/pristine/21" +#define FILE_DIR ".svn/pristine/22" +#define FILE_DIR ".svn/pristine/23" +#define FILE_DIR ".svn/pristine/24" +#define FILE_DIR ".svn/pristine/25" +#define FILE_DIR ".svn/pristine/26" +#define FILE_DIR ".svn/pristine/27" +#define FILE_DIR ".svn/pristine/28" +#define FILE_DIR ".svn/pristine/29" +#define FILE_DIR ".svn/pristine/2a" +#define FILE_DIR ".svn/pristine/2b" +#define FILE_DIR ".svn/pristine/2c" +#define FILE_DIR ".svn/pristine/2d" +#define FILE_DIR ".svn/pristine/2e" +#define FILE_DIR ".svn/pristine/2f" +#define FILE_DIR ".svn/pristine/30" +#define FILE_DIR ".svn/pristine/31" +#define FILE_DIR ".svn/pristine/32" +#define FILE_DIR ".svn/pristine/33" +#define FILE_DIR ".svn/pristine/34" +#define FILE_DIR ".svn/pristine/35" +#define FILE_DIR ".svn/pristine/36" +#define FILE_DIR ".svn/pristine/37" +#define FILE_DIR ".svn/pristine/38" +#define FILE_DIR ".svn/pristine/39" +#define FILE_DIR ".svn/pristine/3a" +#define FILE_DIR ".svn/pristine/3b" +#define FILE_DIR ".svn/pristine/3c" +#define FILE_DIR ".svn/pristine/3d" +#define FILE_DIR ".svn/pristine/3e" +#define FILE_DIR ".svn/pristine/3f" +#define FILE_DIR ".svn/pristine/40" +#define FILE_DIR ".svn/pristine/41" +#define FILE_DIR ".svn/pristine/42" +#define FILE_DIR ".svn/pristine/43" +#define FILE_DIR ".svn/pristine/44" +#define FILE_DIR ".svn/pristine/45" +#define FILE_DIR ".svn/pristine/46" +#define FILE_DIR ".svn/pristine/47" +#define FILE_DIR ".svn/pristine/48" +#define FILE_DIR ".svn/pristine/49" +#define FILE_DIR ".svn/pristine/4a" +#define FILE_DIR ".svn/pristine/4b" +#define FILE_DIR ".svn/pristine/4c" +#define FILE_DIR ".svn/pristine/4d" +#define FILE_DIR ".svn/pristine/4e" +#define FILE_DIR ".svn/pristine/4f" +#define FILE_DIR ".svn/pristine/50" +#define FILE_DIR ".svn/pristine/51" +#define FILE_DIR ".svn/pristine/52" +#define FILE_DIR ".svn/pristine/53" +#define FILE_DIR ".svn/pristine/54" +#define FILE_DIR ".svn/pristine/55" +#define FILE_DIR ".svn/pristine/56" +#define FILE_DIR ".svn/pristine/57" +#define FILE_DIR ".svn/pristine/58" +#define FILE_DIR ".svn/pristine/59" +#define FILE_DIR ".svn/pristine/5a" +#define FILE_DIR ".svn/pristine/5b" +#define FILE_DIR ".svn/pristine/5c" +#define FILE_DIR ".svn/pristine/5d" +#define FILE_DIR ".svn/pristine/5e" +#define FILE_DIR ".svn/pristine/5f" +#define FILE_DIR ".svn/pristine/60" +#define FILE_DIR ".svn/pristine/61" +#define FILE_DIR ".svn/pristine/62" +#define FILE_DIR ".svn/pristine/63" +#define FILE_DIR ".svn/pristine/64" +#define FILE_DIR ".svn/pristine/65" +#define FILE_DIR ".svn/pristine/66" +#define FILE_DIR ".svn/pristine/67" +#define FILE_DIR ".svn/pristine/68" +#define FILE_DIR ".svn/pristine/69" +#define FILE_DIR ".svn/pristine/6a" +#define FILE_DIR ".svn/pristine/6b" +#define FILE_DIR ".svn/pristine/6c" +#define FILE_DIR ".svn/pristine/6d" +#define FILE_DIR ".svn/pristine/6e" +#define FILE_DIR ".svn/pristine/6f" +#define FILE_DIR ".svn/pristine/70" +#define FILE_DIR ".svn/pristine/71" +#define FILE_DIR ".svn/pristine/72" +#define FILE_DIR ".svn/pristine/73" +#define FILE_DIR ".svn/pristine/74" +#define FILE_DIR ".svn/pristine/75" +#define FILE_DIR ".svn/pristine/76" +#define FILE_DIR ".svn/pristine/77" +#define FILE_DIR ".svn/pristine/78" +#define FILE_DIR ".svn/pristine/79" +#define FILE_DIR ".svn/pristine/7a" +#define FILE_DIR ".svn/pristine/7b" +#define FILE_DIR ".svn/pristine/7c" +#define FILE_DIR ".svn/pristine/7d" +#define FILE_DIR ".svn/pristine/7e" +#define FILE_DIR ".svn/pristine/7f" +#define FILE_DIR ".svn/pristine/80" +#define FILE_DIR ".svn/pristine/81" +#define FILE_DIR ".svn/pristine/82" +#define FILE_DIR ".svn/pristine/83" +#define FILE_DIR ".svn/pristine/84" +#define FILE_DIR ".svn/pristine/85" +#define FILE_DIR ".svn/pristine/86" +#define FILE_DIR ".svn/pristine/87" +#define FILE_DIR ".svn/pristine/88" +#define FILE_DIR ".svn/pristine/89" +#define FILE_DIR ".svn/pristine/8a" +#define FILE_DIR ".svn/pristine/8b" +#define FILE_DIR ".svn/pristine/8c" +#define FILE_DIR ".svn/pristine/8d" +#define FILE_DIR ".svn/pristine/8e" +#define FILE_DIR ".svn/pristine/8f" +#define FILE_DIR ".svn/pristine/90" +#define FILE_DIR ".svn/pristine/91" +#define FILE_DIR ".svn/pristine/92" +#define FILE_DIR ".svn/pristine/93" +#define FILE_DIR ".svn/pristine/94" +#define FILE_DIR ".svn/pristine/95" +#define FILE_DIR ".svn/pristine/96" +#define FILE_DIR ".svn/pristine/97" +#define FILE_DIR ".svn/pristine/98" +#define FILE_DIR ".svn/pristine/99" +#define FILE_DIR ".svn/pristine/9a" +#define FILE_DIR ".svn/pristine/9b" +#define FILE_DIR ".svn/pristine/9c" +#define FILE_DIR ".svn/pristine/9d" +#define FILE_DIR ".svn/pristine/9e" +#define FILE_DIR ".svn/pristine/9f" +#define FILE_DIR ".svn/pristine/a0" +#define FILE_DIR ".svn/pristine/a1" +#define FILE_DIR ".svn/pristine/a2" +#define FILE_DIR ".svn/pristine/a3" +#define FILE_DIR ".svn/pristine/a4" +#define FILE_DIR ".svn/pristine/a5" +#define FILE_DIR ".svn/pristine/a6" +#define FILE_DIR ".svn/pristine/a7" +#define FILE_DIR ".svn/pristine/a8" +#define FILE_DIR ".svn/pristine/a9" +#define FILE_DIR ".svn/pristine/aa" +#define FILE_DIR ".svn/pristine/ab" +#define FILE_DIR ".svn/pristine/ac" +#define FILE_DIR ".svn/pristine/ad" +#define FILE_DIR ".svn/pristine/ae" +#define FILE_DIR ".svn/pristine/af" +#define FILE_DIR ".svn/pristine/b0" +#define FILE_DIR ".svn/pristine/b1" +#define FILE_DIR ".svn/pristine/b2" +#define FILE_DIR ".svn/pristine/b3" +#define FILE_DIR ".svn/pristine/b4" +#define FILE_DIR ".svn/pristine/b5" +#define FILE_DIR ".svn/pristine/b6" +#define FILE_DIR ".svn/pristine/b7" +#define FILE_DIR ".svn/pristine/b8" +#define FILE_DIR ".svn/pristine/b9" +#define FILE_DIR ".svn/pristine/ba" +#define FILE_DIR ".svn/pristine/bb" +#define FILE_DIR ".svn/pristine/bc" +#define FILE_DIR ".svn/pristine/bd" +#define FILE_DIR ".svn/pristine/be" +#define FILE_DIR ".svn/pristine/bf" +#define FILE_DIR ".svn/pristine/c0" +#define FILE_DIR ".svn/pristine/c1" +#define FILE_DIR ".svn/pristine/c2" +#define FILE_DIR ".svn/pristine/c3" +#define FILE_DIR ".svn/pristine/c4" +#define FILE_DIR ".svn/pristine/c5" +#define FILE_DIR ".svn/pristine/c6" +#define FILE_DIR ".svn/pristine/c7" +#define FILE_DIR ".svn/pristine/c8" +#define FILE_DIR ".svn/pristine/c9" +#define FILE_DIR ".svn/pristine/ca" +#define FILE_DIR ".svn/pristine/cb" +#define FILE_DIR ".svn/pristine/cc" +#define FILE_DIR ".svn/pristine/cd" +#define FILE_DIR ".svn/pristine/ce" +#define FILE_DIR ".svn/pristine/cf" +#define FILE_DIR ".svn/pristine/d0" +#define FILE_DIR ".svn/pristine/d1" +#define FILE_DIR ".svn/pristine/d2" +#define FILE_DIR ".svn/pristine/d3" +#define FILE_DIR ".svn/pristine/d4" +#define FILE_DIR ".svn/pristine/d5" +#define FILE_DIR ".svn/pristine/d6" +#define FILE_DIR ".svn/pristine/d7" +#define FILE_DIR ".svn/pristine/d8" +#define FILE_DIR ".svn/pristine/d9" +#define FILE_DIR ".svn/pristine/da" +#define FILE_DIR ".svn/pristine/db" +#define FILE_DIR ".svn/pristine/dc" +#define FILE_DIR ".svn/pristine/dd" +#define FILE_DIR ".svn/pristine/de" +#define FILE_DIR ".svn/pristine/df" +#define FILE_DIR ".svn/pristine/e0" +#define FILE_DIR ".svn/pristine/e1" +#define FILE_DIR ".svn/pristine/e2" +#define FILE_DIR ".svn/pristine/e3" +#define FILE_DIR ".svn/pristine/e4" +#define FILE_DIR ".svn/pristine/e5" +#define FILE_DIR ".svn/pristine/e6" +#define FILE_DIR ".svn/pristine/e7" +#define FILE_DIR ".svn/pristine/e8" +#define FILE_DIR ".svn/pristine/e9" +#define FILE_DIR ".svn/pristine/ea" +#define FILE_DIR ".svn/pristine/eb" +#define FILE_DIR ".svn/pristine/ec" +#define FILE_DIR ".svn/pristine/ed" +#define FILE_DIR ".svn/pristine/ee" +#define FILE_DIR ".svn/pristine/ef" +#define FILE_DIR ".svn/pristine/f0" +#define FILE_DIR ".svn/pristine/f1" +#define FILE_DIR ".svn/pristine/f2" +#define FILE_DIR ".svn/pristine/f3" +#define FILE_DIR ".svn/pristine/f4" +#define FILE_DIR ".svn/pristine/f5" +#define FILE_DIR ".svn/pristine/f6" +#define FILE_DIR ".svn/pristine/f7" +#define FILE_DIR ".svn/pristine/f8" +#define FILE_DIR ".svn/pristine/f9" +#define FILE_DIR ".svn/pristine/fa" +#define FILE_DIR ".svn/pristine/fb" +#define FILE_DIR ".svn/pristine/fc" +#define FILE_DIR ".svn/pristine/fd" +#define FILE_DIR ".svn/pristine/fe" +#define FILE_DIR ".svn/pristine/ff" #define FILE_DIR "code" #define FILE_DIR "code/ATMOSPHERICS" #define FILE_DIR "code/ATMOSPHERICS/components" @@ -141,6 +399,15 @@ #define FILE_DIR "code/WorkInProgress/organs" #define FILE_DIR "code/WorkInProgress/virus2" #define FILE_DIR "code/WorkInProgress/virus2/Disease2" +#define FILE_DIR "config" +#define FILE_DIR "config/names" +#define FILE_DIR "data" +#define FILE_DIR "data/logs" +#define FILE_DIR "data/logs/2011" +#define FILE_DIR "data/logs/2011/11-November" +#define FILE_DIR "data/player_saves" +#define FILE_DIR "data/player_saves/b" +#define FILE_DIR "data/player_saves/b/blaank" #define FILE_DIR "html" #define FILE_DIR "icons" #define FILE_DIR "icons/effects" @@ -154,12 +421,14 @@ #define FILE_DIR "icons/obj/machines" #define FILE_DIR "icons/obj/pipes" #define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/PSD files" #define FILE_DIR "icons/spideros_icons" #define FILE_DIR "icons/Testing" #define FILE_DIR "icons/turf" #define FILE_DIR "icons/vending_icons" #define FILE_DIR "interface" #define FILE_DIR "maps" +#define FILE_DIR "music" #define FILE_DIR "sound" #define FILE_DIR "sound/ambience" #define FILE_DIR "sound/announcer" @@ -173,6 +442,7 @@ #define FILE_DIR "sound/spells" #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" +#define FILE_DIR "SQL" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG