diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index e217b36839c..aeaa6f4b030 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -27,6 +27,7 @@ item_state = "bl_suit" color = "black" desc = null + origin_tech = "syndicate=3" var/list/clothing_choices = list() /obj/item/clothing/under/chameleon/all diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm index 42523cd6401..7dfe98aef05 100644 --- a/code/defines/obj/clothing/mask.dm +++ b/code/defines/obj/clothing/mask.dm @@ -85,6 +85,7 @@ var/mode = 0// 0==Scouter | 1==Night Vision | 2==Thermal | 3==Meson var/voice = "Unknown" var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N + origin_tech = "syndicate=4" /obj/item/clothing/mask/gas/voice/space_ninja name = "ninja mask" diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm index cced79ac8cb..ea8048a73e0 100644 --- a/code/defines/obj/radio.dm +++ b/code/defines/obj/radio.dm @@ -83,6 +83,7 @@ /obj/item/device/radio/headset/traitor translate_binary = 1 channels = list("Syndicate" = 1) + origin_tech = "syndicate=3" /obj/item/device/radio/headset/headset_sec // -- TLE name = "Security Radio Headset" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index f2101605ad2..a319e2d2c39 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -271,7 +271,7 @@ throw_range = 5 w_class = 2.0 flags = FPRINT | TABLEPASS | NOSHIELD - origin_tech = "magnets=3;syndicate=3" + origin_tech = "magnets=3;syndicate=4" /obj/item/weapon/melee/energy/sword/chainsword color = "chain" @@ -437,7 +437,7 @@ /obj/item/weapon/card/id/syndicate name = "agent card" access = list(access_maint_tunnels) - origin_tech = "syndicate=2" + origin_tech = "syndicate=3" /obj/item/weapon/card/id/captains_spare name = "Captain's spare ID" @@ -492,7 +492,7 @@ throw_speed = 2 throw_range = 10 w_class = 2.0 - origin_tech = "magnets=3;syndicate=3" + origin_tech = "magnets=3;syndicate=4" #define MAXCOIL 30 /obj/item/weapon/cable_coil @@ -1219,7 +1219,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov /obj/item/weapon/pen/sleepypen desc = "It's a normal black ink pen with a sharp point." flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER - origin_tech = "materials=2;biotech=1;syndicate=2" + origin_tech = "materials=2;biotech=1;syndicate=5" /obj/item/weapon/rack_parts name = "rack parts" @@ -1882,6 +1882,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov item_state = "plasticx" flags = FPRINT | TABLEPASS | USEDELAY w_class = 2.0 + origin_tech = "syndicate=2" var/timer = 10 var/atom/target = null diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 3cfb82170a8..3157c2ec407 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -446,7 +446,7 @@ if ("Head of Security") //ready to come in game and kick ass - Microwave src.equip_if_possible(new /obj/item/device/radio/headset/heads/hos (src), slot_ears) - src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/heads/hos(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/suit/armor/hos(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) @@ -462,7 +462,7 @@ if ("Head of Personnel") src.equip_if_possible(new /obj/item/device/radio/headset/heads/hop (src), slot_ears) // -- TLE src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back) - src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/heads/hop(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) @@ -540,7 +540,7 @@ if ("Chief Engineer") src.equip_if_possible(new /obj/item/device/radio/headset/heads/ce (src), slot_ears) - src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/heads/ce(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves) //changed to black as part of dangercon 2011, approved by Urist_McDorf --Errorage src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(src), slot_head) @@ -553,7 +553,7 @@ if ("Research Director") src.equip_if_possible(new /obj/item/device/radio/headset/heads/rd (src), slot_ears) - src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/heads/rd(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/under/rank/research_director(src), slot_w_uniform) src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit) @@ -563,7 +563,7 @@ if ("Chief Medical Officer") src.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo (src), slot_ears) - src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt) + src.equip_if_possible(new /obj/item/device/pda/heads/cmo(src), slot_belt) src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(src), slot_w_uniform) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index a8c5b84eb8a..cc2647de59a 100644 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -76,6 +76,26 @@ default_cartridge = /obj/item/weapon/cartridge/head icon_state = "pda-h" +/obj/item/device/pda/heads/hop + default_cartridge = /obj/item/weapon/cartridge/hop + icon_state = "pda-hop" + +/obj/item/device/pda/heads/hos + default_cartridge = /obj/item/weapon/cartridge/hos + icon_state = "pda-hos" + +/obj/item/device/pda/heads/ce + default_cartridge = /obj/item/weapon/cartridge/ce + icon_state = "pda-ce" + +/obj/item/device/pda/heads/cmo + default_cartridge = /obj/item/weapon/cartridge/cmo + icon_state = "pda-cmo" + +/obj/item/device/pda/heads/rd + default_cartridge = /obj/item/weapon/cartridge/rd + icon_state = "pda-rd" + /obj/item/device/pda/captain default_cartridge = /obj/item/weapon/cartridge/captain icon_state = "pda-c" diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm index 371e8cf45ff..cb9eb08b262 100644 --- a/code/game/objects/devices/PDA/cart.dm +++ b/code/game/objects/devices/PDA/cart.dm @@ -98,10 +98,58 @@ name = "Easy-Record DELUXE" icon_state = "cart-h" access_manifest = 1 - access_engine = 1 - access_security = 1 access_status_display = 1 + hop + name = "HumanResources9001" + icon_state = "cart-h" + access_manifest = 1 + access_status_display = 1 + access_quartermaster = 1 + + New() + ..() + spawn(5) + radio = new /obj/item/radio/integrated/mule(src) + + hos + name = "R.O.B.U.S.T. DELUXE" + icon_state = "cart-hos" + access_manifest = 1 + access_status_display = 1 + access_security = 1 + + New() + ..() + spawn(5) + radio = new /obj/item/radio/integrated/beepsky(src) + + ce + name = "Power-On DELUXE" + icon_state = "cart-ce" + access_manifest = 1 + access_status_display = 1 + access_engine = 1 + + cmo + name = "Med-U DELUXE" + icon_state = "cart-cmo" + access_manifest = 1 + access_status_display = 1 + access_medical = 1 + + rd + name = "Signal Ace DELUXE" + icon_state = "cart-rd" + access_manifest = 1 + access_status_display = 1 + access_reagent_scanner = 1 + + New() + ..() + spawn(5) + radio = new /obj/item/radio/integrated/signal(src) + captain name = "Value-PAK Cartridge" desc = "Now with 200% more value!" diff --git a/code/game/objects/devices/chameleonproj.dm b/code/game/objects/devices/chameleonproj.dm index f2c5e7ebc09..c8db6dbb1c9 100644 --- a/code/game/objects/devices/chameleonproj.dm +++ b/code/game/objects/devices/chameleonproj.dm @@ -37,7 +37,7 @@ throw_speed = 1 throw_range = 5 w_class = 2.0 - origin_tech = "syndicate=2;magnets=4" + origin_tech = "syndicate=4;magnets=4" var/can_use = 1 var/obj/dummy/chameleon/active_dummy = null var/saved_item = "/obj/item/weapon/shard" diff --git a/code/game/objects/devices/powersink.dm b/code/game/objects/devices/powersink.dm index 14b4e78f5d6..2edeb1ede24 100644 --- a/code/game/objects/devices/powersink.dm +++ b/code/game/objects/devices/powersink.dm @@ -12,7 +12,7 @@ throw_range = 2 m_amt = 750 w_amt = 750 - origin_tech = "powerstorage=3;syndicate=3" + origin_tech = "powerstorage=3;syndicate=5" var/drain_rate = 600000 // amount of power to drain per tick var/power_drained = 0 // has drained this much power var/max_power = 1e8 // maximum power that can be drained before exploding diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index f816cde4fb0..215d5c5e3f5 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -150,7 +150,7 @@ return /obj/item/weapon/pen/sleepypen - origin_tech = "syndicate=1" + origin_tech = "syndicate=5" /obj/item/weapon/pen/sleepypen/attack_paw(mob/user as mob) return src.attack_hand(user) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 69789b4f205..8589cf41904 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -453,7 +453,7 @@ AI MODULES name = "Hacked AI Module" var/newFreeFormLaw = "freeform" desc = "A hacked AI law module: ''" - origin_tech = "programming=3;materials=6;syndicate=3" + origin_tech = "programming=3;materials=6;syndicate=7" /obj/item/weapon/aiModule/syndicate/attack_hand(var/mob/user as mob) ..() diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index e1002280d2a..2d8993b918e 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -244,7 +244,7 @@ var/const/PROJECTILE_DART = 8 name = "revolver" icon_state = "revolver" caliber = "357" - origin_tech = "combat=2;materials=2" + origin_tech = "combat=2;materials=2;syndicate=6" w_class = 3.0 throw_speed = 2 throw_range = 10 @@ -306,6 +306,7 @@ var/const/PROJECTILE_DART = 8 icon_state = "detective" force = 14.0 caliber = "38" + origin_tech = "combat=2;materials=2" New() for(var/i = 1, i <= max_shells, i++) @@ -341,6 +342,7 @@ var/const/PROJECTILE_DART = 8 name = "mateba" desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo." icon_state = "mateba" + origin_tech = "combat=2;materials=2" shotgun name = "shotgun" @@ -349,7 +351,9 @@ var/const/PROJECTILE_DART = 8 max_shells = 2 w_class = 4.0 force = 7.0 + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK caliber = "shotgun" + origin_tech = "combat=2;materials=2" New() for(var/i = 1, i <= max_shells, i++) @@ -425,6 +429,10 @@ var/const/PROJECTILE_DART = 8 force = 7.0 m_amt = 2000 origin_tech = "combat=3;magnets=2" + mode = 1 //We don't want laser guns to be on a stun setting. --Superxpdude + + attack_self(mob/living/user as mob) + return // We don't want laser guns to be able to change to a stun setting. --Superxpdude captain icon_state = "caplaser" @@ -485,7 +493,7 @@ var/const/PROJECTILE_DART = 8 destroyer name = "pulse destroyer" - desc = "A heavy-duty, pulse-based energy weapon. The mode is set to DESRTOY. Always destroy." + desc = "A heavy-duty, pulse-based energy weapon. The mode is set to DESTROY. Always destroy." mode = 2 New() power_supply = new /obj/item/weapon/cell/infinite(src) @@ -612,7 +620,7 @@ var/const/PROJECTILE_DART = 8 throw_speed = 2 throw_range = 10 m_amt = 2000 - origin_tech = "combat=2;magnets=2;syndicate=2" + origin_tech = "combat=2;magnets=2;syndicate=5" silenced = 1 fire_sound = 'Genhit.ogg' diff --git a/code/game/research/designs.dm b/code/game/research/designs.dm index 0178b663f9f..3bc7ddf68b3 100644 --- a/code/game/research/designs.dm +++ b/code/game/research/designs.dm @@ -93,6 +93,15 @@ datum materials = list("$glass" = 2000, "acid" = 20) build_path = "/obj/item/weapon/circuitboard/aiupload" + borgupload + name = "Circuit Design (Cyborg Upload)" + desc = "Allows for the construction of circuit boards used to build a Cyborg Upload Console." + id = "borgupload" + req_tech = list("programming" = 4) + build_type = IMPRINTER + materials = list("$glass" = 2000, "acid" = 20) + build_path = "/obj/item/weapon/circuitboard/borgupload" + med_data name = "Circuit Design (Medical Records)" desc = "Allows for the construction of circuit boards used to build a medical records console." diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 22eeac2fbdb..8f0d44d9f58 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index d34fbb65965..3efc7f232f8 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -1082,7 +1082,7 @@ "auP" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/obj/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auQ" = (/obj/machinery/door/airlock/external{name = "West Auxillary Solar Maintenance"; req_access = null; req_access_txt = "13"},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport) "auR" = (/obj/grille,/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tech) -"auS" = (/obj/rack{dir = 8},/obj/item/weapon/circuitboard/aiupload,/turf/simulated/floor,/area/storage/tech) +"auS" = (/obj/rack{dir = 8},/obj/item/weapon/circuitboard/borgupload{pixel_x = -1; pixel_y = 1},/obj/item/weapon/circuitboard/aiupload{pixel_x = 2; pixel_y = -2},/turf/simulated/floor,/area/storage/tech) "auT" = (/obj/rack{dir = 8},/obj/item/weapon/circuitboard/robotics{pixel_x = -2; pixel_y = 2},/obj/item/weapon/circuitboard/mecha_control{pixel_x = 1; pixel_y = -1},/turf/simulated/floor,/area/storage/tech) "auU" = (/obj/machinery/atmospherics/pipe/simple{dir = 9},/obj/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "auV" = (/obj/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/fpmaint)