diff --git a/baystation12.dme b/baystation12.dme index 4b84b15aa88..9c90ea95b24 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -5,6 +5,64 @@ // END_INTERNALS // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/TriDimension" +#define FILE_DIR "code/WorkInProgress" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jungle" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/ShieldGen" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" +#define FILE_DIR "code/WorkInProgress/Susan" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/48x48" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/human_races" +#define FILE_DIR "icons/mob/otherHuman" +#define FILE_DIR "icons/NTOS" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/pipes" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/effects/turret" +#define FILE_DIR "sound/effects/wind" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/music" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/turntable" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/voice/Serithi" +#define FILE_DIR "sound/vox" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG @@ -580,7 +638,6 @@ #include "code\game\objects\items\weapons\power_cells.dm" #include "code\game\objects\items\weapons\RCD.dm" #include "code\game\objects\items\weapons\RCS.dm" -#include "code\game\objects\items\weapons\RPD.dm" #include "code\game\objects\items\weapons\RSF.dm" #include "code\game\objects\items\weapons\scrolls.dm" #include "code\game\objects\items\weapons\shields.dm" @@ -843,10 +900,10 @@ #include "code\modules\customitems\item_spawning.dm" #include "code\modules\customitems\definitions\base.dm" #include "code\modules\destilery\main.dm" -#include "code\modules\detectivework\detective_work.dm" -#include "code\modules\detectivework\evidence.dm" -#include "code\modules\detectivework\footprints_and_rag.dm" -#include "code\modules\detectivework\scanner.dm" +#include "code\modules\DetectiveWork\detective_work.dm" +#include "code\modules\DetectiveWork\evidence.dm" +#include "code\modules\DetectiveWork\footprints_and_rag.dm" +#include "code\modules\DetectiveWork\scanner.dm" #include "code\modules\economy\Accounts.dm" #include "code\modules\economy\Accounts_DB.dm" #include "code\modules\economy\ATM.dm" @@ -1103,7 +1160,6 @@ #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" #include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\mouse.dm" -#include "code\modules\mob\living\simple_animal\friendly\mushroom.dm" #include "code\modules\mob\living\simple_animal\friendly\slime.dm" #include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm" #include "code\modules\mob\living\simple_animal\friendly\tomato.dm" @@ -1118,6 +1174,7 @@ #include "code\modules\mob\living\simple_animal\hostile\hostile.dm" #include "code\modules\mob\living\simple_animal\hostile\mimic.dm" #include "code\modules\mob\living\simple_animal\hostile\mining_mobs.dm" +#include "code\modules\mob\living\simple_animal\hostile\mushroom.dm" #include "code\modules\mob\living\simple_animal\hostile\pirate.dm" #include "code\modules\mob\living\simple_animal\hostile\russian.dm" #include "code\modules\mob\living\simple_animal\hostile\syndicate.dm" diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index e1ec0585d68..0805f639c4d 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -39,8 +39,8 @@ var/global/list/facial_hair_styles_male_list = list() var/global/list/facial_hair_styles_female_list = list() var/global/list/skin_styles_female_list = list() //unused //Underwear -var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "Love-Hearts", "Black2", "Grey2", "Stripey", "Kinky", "None") //Curse whoever made male/female underwear diffrent colours -var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "Babydoll", "Baby-Blue", "Green", "Pink", "Kinky", "None") +var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") //Curse whoever made male/female underwear diffrent colours +var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "None") //Backpacks var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt") @@ -125,4 +125,4 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al for(var/path in typesof(prototype)) if(path == prototype) continue L += new path() - return L \ No newline at end of file + return L diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index f28dd677fc5..e8b63a86ae3 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -23,9 +23,6 @@ var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour var/allow_vote_restart = 0 // allow votes to restart var/allow_vote_mode = 0 // allow votes to change mode - var/allow_admin_jump = 1 // allows admin jumping - var/allow_admin_spawning = 1 // allows admin item spawning - var/allow_admin_rev = 1 // allows admin revives var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default) var/vote_period = 600 // length of voting period (deciseconds, default 1 minute) var/vote_autotransfer_initial = 72000 // Length of time before the first autotransfer vote is called @@ -258,16 +255,7 @@ if ("allow_vote_mode") config.allow_vote_mode = 1 - if ("allow_admin_jump") - config.allow_admin_jump = 1 - - if("allow_admin_rev") - config.allow_admin_rev = 1 - - if ("allow_admin_spawning") - config.allow_admin_spawning = 1 - - if ("no_dead_vote") + if("no_dead_vote") config.vote_no_dead = 1 if ("default_no_vote") diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 611f5ce8ae9..d080c3c28ca 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -45,12 +45,13 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/food name = "Food crate" - contains = list(/obj/item/weapon/reagent_containers/food/drinks/flour, + contains = list(/obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, /obj/item/weapon/reagent_containers/food/drinks/milk, /obj/item/weapon/reagent_containers/food/drinks/milk, /obj/item/weapon/storage/fancy/egg_box, - /obj/item/weapon/reagent_containers/food/condiment/enzyme, - /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/reagent_containers/food/snacks/grown/banana) cost = 10 @@ -1064,4 +1065,4 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee cost = 15 containertype = /obj/structure/closet/crate containername = "mafia supply crate" - group = "Operations" \ No newline at end of file + group = "Operations" diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 272b5d3900a..477f93253b9 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -526,11 +526,18 @@ proc/process_ghost_teleport_locs() icon_state = "yellow" requires_power = 0 -/area/ninja_outpost - name = "\improper SpiderClan Outpost" +/area/ninja + name = "\improper Ninja Area Parent" icon_state = "ninjabase" requires_power = 0 +/area/ninja/outpost + name = "\improper SpiderClan Outpost" + +/area/ninja/holding + name = "\improper SpiderClan Holding Facility" + + /area/vox_station/transit name = "\improper hyperspace" icon_state = "shuttle" @@ -881,6 +888,14 @@ proc/process_ghost_teleport_locs() name = "\improper Messaging Server Room" icon_state = "server" +/area/ntrep + name = "\improper NanoTrasen Rep Office" + icon_state = "bluenew" + +/area/blueshield + name = "\improper Blueshield's Office" + icon_state = "blueold" + //Crew /area/crew_quarters diff --git a/code/game/atoms.dm b/code/game/atoms.dm index dbcd8aa4739..234a79c84cf 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -42,6 +42,9 @@ M.take_organ_damage(20) +/atom/proc/CheckParts() + return + /atom/proc/assume_air(datum/gas_mixture/giver) del(giver) return null diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index 1d46eb54d09..21eec348bdf 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -104,11 +104,10 @@ var/list/deactivation_messages=list() /datum/dna/gene/basic/can_activate(var/mob/M,var/flags) - // Probability check - if(flags & MUTCHK_FORCED || probinj(activation_prob,(flags&MUTCHK_FORCED))) + if(flags & MUTCHK_FORCED) return 1 - - return 0 + // Probability check + return probinj(activation_prob,(flags&MUTCHK_FORCED)) /datum/dna/gene/basic/activate(var/mob/M) M.mutations.Add(mutation) diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index ecf4644be4a..6e6b3346858 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -54,7 +54,7 @@ if(!istype(T)) return if(T.lighting_lumcount <= 2) - M.alpha = round(255 * 0.05) + M.alpha = 0 else M.alpha = round(255 * 0.80) diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index e92917f2f7e..9f7bdcc4569 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -71,6 +71,8 @@ block=COLDBLOCK can_activate(var/mob/M,var/flags) + if(flags & MUTCHK_FORCED) + return !(/datum/dna/gene/basic/cold_resist in M.active_genes) // Probability check var/_prob = 15 if(M_RESIST_COLD in M.mutations) @@ -90,6 +92,8 @@ block=FIREBLOCK can_activate(var/mob/M,var/flags) + if(flags & MUTCHK_FORCED) + return !(/datum/dna/gene/basic/heat_resist in M.active_genes) // Probability check var/_prob=30 if(M_RESIST_HEAT in M.mutations) diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm index c86f444f00f..4835d9a61b6 100644 --- a/code/game/gamemodes/events/biomass.dm +++ b/code/game/gamemodes/events/biomass.dm @@ -157,6 +157,8 @@ /obj/effect/biomass/temperature_expose(null, temp, volume) //hotspots kill biomass del src +/datum/event/biomass/start() + biomass_infestation() /proc/biomass_infestation() @@ -173,3 +175,6 @@ var/turf/simulated/floor/T = pick(turfs) new/obj/effect/biomass_controller(T) //spawn a controller at turf message_admins("\blue Event: Biomass spawned at [T.loc.loc] ([T.x],[T.y],[T.z])") + + + diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index f33229ed26e..03ef264b20f 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -186,6 +186,7 @@ ________________________________________________________________________________ unlock_suit() break lock_suit(U,1)//Check for icons. + U.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255) U.regenerate_icons() U << "\blue Linking neural-net interface...\nPattern \green GREEN\blue, continuing operation." if(4) @@ -238,6 +239,8 @@ ________________________________________________________________________________ cancel_stealth()//Shutdowns stealth. if(4) U << "\blue Disconnecting neural-net interface...\greenSuccess\blue." + U.hud_used.instantiate() + U.regenerate_icons() if(5) U << "\blue Disengaging neural-net interface...\greenSuccess\blue." if(6) @@ -558,6 +561,17 @@ ________________________________________________________________________________ P.overlays.Cut() P.overlays += image('icons/obj/pda.dmi', "pda-r") + var/mob/living/L = null + if(P.loc && isliving(P.loc)) + L = P.loc + //Maybe they are a pAI! + else + L = get(P, /mob/living/silicon) + + + if(L) + L << "\icon[P] Message from [!s_control?(A):"an unknown source"], \"[t]\" (Unable to Reply)" + if("Inject") if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left. display_to << "\red Error: the suit cannot perform this function. Out of [href_list["name"]]." diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 9f26b049b8c..61196ac5a2b 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1415,7 +1415,7 @@ datum check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. var/captured_amount = 0 - var/area/centcom/holding/A = locate() + var/area/ninja/holding/A = locate() for(var/mob/living/carbon/human/M in A)//Humans. if(M.stat==2)//Dead folks are worth less. captured_amount+=0.5 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 27164b5abc9..1be0c2fe405 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -566,7 +566,7 @@ datum/objective/capture check_completion()//Basically runs through all the mobs in the area to determine how much they are worth. var/captured_amount = 0 - var/area/centcom/holding/A = locate() + var/area/ninja/holding/A = locate() for(var/mob/living/carbon/human/M in A)//Humans. if(M.stat==2)//Dead folks are worth less. captured_amount+=0.5 diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 72d59460da5..8672a84b827 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -40,11 +40,6 @@ typepath = /obj/item/weapon/rcd protected_jobs = list("Chief Engineer") -/datum/theft_objective/rpd - name = "an RPD" - typepath = /obj/item/weapon/pipe_dispenser - protected_jobs = list("Chief Engineer") - /datum/theft_objective/jetpack name = "a jetpack" typepath = /obj/item/weapon/tank/jetpack diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 5a6ac945acd..65cfa8f227a 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -4,8 +4,8 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/stack/sheet/metal(), \ new /obj/item/stack/sheet/glass(), \ new /obj/item/stack/sheet/rglass(), \ - new /obj/item/stack/rods(), \ new /obj/item/stack/sheet/fur(), \ + new /obj/item/stack/rods(), \ new /obj/item/weapon/crowbar(), \ new /obj/item/weapon/screwdriver(), \ new /obj/item/weapon/weldingtool(), \ @@ -21,7 +21,6 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/airlock_electronics(), \ new /obj/item/weapon/airalarm_electronics(), \ new /obj/item/weapon/firealarm_electronics(), \ - new /obj/item/weapon/rcd_ammo(), \ new /obj/item/weapon/kitchenknife(), \ new /obj/item/weapon/scalpel(), \ new /obj/item/weapon/circular_saw(), \ @@ -32,9 +31,6 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/reagent_containers/glass/beaker(), \ new /obj/item/weapon/reagent_containers/glass/beaker/large(), \ new /obj/item/weapon/reagent_containers/glass/bucket(), \ - new /obj/item/weapon/storage/box/blanks(), \ - new /obj/item/ammo_casing/shotgun/beanbag(), \ - new /obj/item/ammo_box/c38(), \ new /obj/item/device/taperecorder(), \ new /obj/item/device/assembly/igniter(), \ new /obj/item/device/assembly/signaler(), \ @@ -46,6 +42,12 @@ var/global/list/autolathe_recipes = list( \ new /obj/item/weapon/light/tube(), \ new /obj/item/weapon/light/bulb(), \ new /obj/item/weapon/camera_assembly(), \ + new /obj/item/weapon/rcd_ammo(), \ + new /obj/item/ammo_casing/shotgun/beanbag(), \ + new /obj/item/weapon/storage/box/blanks(), \ + new /obj/item/ammo_casing/shotgun(), \ + new /obj/item/ammo_box/c38(), \ + new /obj/item/ammo_box/a357(), \ new /obj/item/clothing/ears/earmuffs/tribblemuffs(), \ new /obj/item/clothing/gloves/furgloves(), \ new /obj/item/clothing/head/furcap(), \ @@ -60,12 +62,9 @@ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/device/radio/electropack(), \ new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/weapon/handcuffs(), \ - new /obj/item/ammo_box/a357(), \ - new /obj/item/ammo_casing/shotgun(), \ - new /obj/item/ammo_casing/shotgun/dart(), \ - /* new /obj/item/weapon/shield/riot(), */ \ + /*new /obj/item/ammo_casing/shotgun/dart(), \ + new /obj/item/weapon/shield/riot(), */ \ ) - /obj/machinery/autolathe name = "autolathe" desc = "It produces items using metal and glass." diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index c85da2eab00..92f01384aa6 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -53,6 +53,13 @@ input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans output = /obj/item/weapon/reagent_containers/food/snacks/soydope + wheat + input = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat + output = /obj/item/weapon/reagent_containers/food/snacks/flour + + spaghetti + input = /obj/item/weapon/reagent_containers/food/snacks/flour + output = /obj/item/weapon/reagent_containers/food/snacks/spagetti /* mobs */ mob @@ -143,13 +150,13 @@ src.processing = 1 user.visible_message("\blue [user] turns on \a [src].", \ "You turn on \a [src].", \ - "You hear a food processor") + "You hear a food processor.") playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) use_power(500) sleep(P.time) P.process(src.loc, O) src.processing = 0 src.visible_message("\blue \the [src] finished processing.", \ - "You hear food processor stops") + "You hear the food processor stopping/") diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 0a3bd75000d..f6a0c555cdc 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -232,6 +232,10 @@ Class Procs: src.add_fingerprint(user) return 0 +/obj/machinery/CheckParts() + RefreshParts() + return + /obj/machinery/proc/RefreshParts() //Placeholder proc for machines that are built using frames. return return 0 diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7a365a0d959..58036ea0d87 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -136,13 +136,13 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/syndicate default_cartridge = /obj/item/weapon/cartridge/syndicate - icon_state = "pda-syn" + icon_state = "pda-syndi" name = "Military PDA" owner = "John Doe" hidden = 1 /obj/item/device/pda/chaplain - icon_state = "pda-holy" + icon_state = "pda-chaplain" ttone = "holy" /obj/item/device/pda/lawyer @@ -158,7 +158,7 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-robot" /obj/item/device/pda/librarian - icon_state = "pda-libb" + icon_state = "pda-library" desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!" silent = 1 //Quiet in the library! @@ -172,19 +172,19 @@ var/global/list/obj/item/device/pda/PDAs = list() icon_state = "pda-chef" /obj/item/device/pda/bar - icon_state = "pda-bar" + icon_state = "pda-bartender" /obj/item/device/pda/atmos default_cartridge = /obj/item/weapon/cartridge/atmos - icon_state = "pda-atmo" + icon_state = "pda-atmos" /obj/item/device/pda/chemist default_cartridge = /obj/item/weapon/cartridge/chemistry - icon_state = "pda-chem" + icon_state = "pda-chemistry" /obj/item/device/pda/geneticist default_cartridge = /obj/item/weapon/cartridge/medical - icon_state = "pda-gene" + icon_state = "pda-genetics" // Special AI/pAI PDAs that cannot explode. diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm deleted file mode 100644 index 52ebc04f3bc..00000000000 --- a/code/game/objects/items/weapons/RPD.dm +++ /dev/null @@ -1,426 +0,0 @@ -//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32 - -/* -CONTAINS: -RPD -*/ -#define PIPE_BINARY 0 -#define PIPE_BENT 1 -#define PIPE_TRINARY 2 -#define PIPE_UNARY 3 - -/datum/pipe_info - var/id=-1 - var/dir=SOUTH - var/dirtype=PIPE_BINARY - var/icon = 'icons/obj/pipe-item.dmi' - var/icon_state="" - var/selected=0 - -/datum/pipe_info/New(var/pid,var/direction,var/dt) - src.id=pid - src.icon_state=pipeID2State[pid+1] - src.dir=direction - src.dirtype=dt - -/datum/pipe_info/proc/Render(var/dispenser,var/label) - return "
" - dirsel += render_dir_img(1,"vertical.png","Vertical") - dirsel += render_dir_img(4,"horizontal.png","Horizontal") - dirsel += "
" - else - dirsel+={" - - "} - if(PIPE_BENT) // Bent, N-W, N-E etc - if(preview) - user << browse_rsc(new /icon(preview, dir=NORTHWEST), "nw.png") - user << browse_rsc(new /icon(preview, dir=NORTHEAST), "ne.png") - user << browse_rsc(new /icon(preview, dir=SOUTHWEST), "sw.png") - user << browse_rsc(new /icon(preview, dir=SOUTHEAST), "se.png") - - dirsel += ""
- dirsel += render_dir_img(9,"nw.png","West to North")
- dirsel += render_dir_img(5,"ne.png","North to East")
- dirsel += "
"
- dirsel += render_dir_img(10,"sw.png","South to West")
- dirsel += render_dir_img(6,"se.png","East to South")
- dirsel += "
"
- dirsel += render_dir_img(1,"s.png","West South East")
- dirsel += render_dir_img(4,"w.png","North West South")
- dirsel += "
"
- dirsel += render_dir_img(2,"n.png","East North West")
- dirsel += render_dir_img(8,"e.png","South East North")
- dirsel += "
" - dirsel += render_dir_img(NORTH,"n.png","North") - dirsel += render_dir_img(EAST, "e.png","East") - dirsel += render_dir_img(SOUTH,"s.png","South") - dirsel += render_dir_img(WEST, "w.png","West") - dirsel += "
" - else - dirsel+={" - - "} - dat = {" - - -