diff --git a/code/WorkInProgress/BS12/uplinks.dm b/code/WorkInProgress/BS12/uplinks.dm index 1e8ca500758..6734182e76e 100644 --- a/code/WorkInProgress/BS12/uplinks.dm +++ b/code/WorkInProgress/BS12/uplinks.dm @@ -95,7 +95,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid if(uses > 6) randomItems.Add("/obj/item/weapon/aiModule/syndicate") //Hacked AI Upload Module - randomItems.Add("/obj/machinery/singularity_beacon/syndicate") //Singularity Beacon + randomItems.Add("/obj/item/device/radio/beacon/syndicate") //Singularity Beacon if(uses > 5) randomItems.Add("/obj/item/weapon/gun/projectile") //Revolver @@ -108,7 +108,6 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/weapon/melee/energy/sword") //Energy Sword randomItems.Add("/obj/item/clothing/mask/gas/voice") //Voice Changer randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector - randomItems.Add("/obj/item/clothing/glasses/thermal") //Syndicate Space Suit if(uses > 2) randomItems.Add("/obj/item/weapon/storage/emp_kit") //EMP Grenades @@ -120,15 +119,19 @@ A list of items and costs is stored under the datum of every game mode, alongsid randomItems.Add("/obj/item/weapon/storage/syndie_kit/space") //Syndicate Space Suit randomItems.Add("/obj/item/device/encryptionkey/binary") //Binary Translator Key randomItems.Add("/obj/item/weapon/storage/syndie_kit/imp_freedom") //Freedom Implant + randomItems.Add("/obj/item/clothing/glasses/thermal") //Thermal Imaging Goggles if(uses > 1) - var/list/usrItems = usr.get_contents() +/* + var/list/usrItems = usr.get_contents() //Checks to see if the user has a revolver before giving ammo var/hasRevolver = 0 for(var/obj/I in usrItems) //Only add revolver ammo if the user has a gun that can shoot it if(istype(I,/obj/item/weapon/gun/projectile)) hasRevolver = 1 if(hasRevolver) randomItems.Add("/obj/item/ammo_magazine/a357") //Revolver ammo +*/ + randomItems.Add("/obj/item/ammo_magazine/a357") //Revolver ammo randomItems.Add("/obj/item/clothing/shoes/syndigaloshes") //No-Slip Syndicate Shoes randomItems.Add("/obj/item/weapon/plastique") //C4 @@ -145,19 +148,19 @@ A list of items and costs is stored under the datum of every game mode, alongsid switch(href_list["buy_item"]) //Ok, this gets a little messy, sorry. if("/obj/item/weapon/circuitboard/teleporter") uses -= 20 - if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/syndie_kit/imp_uplink") + if("/obj/item/toy/syndicateballoon" , "/obj/item/weapon/storage/syndie_kit/imp_uplink" , "/obj/item/weapon/storage/box/syndicate") uses -= 10 - if("/obj/item/weapon/aiModule/syndicate" , "/obj/machinery/singularity_beacon/syndicate" , "/obj/item/weapon/storage/box/syndicate") + if("/obj/item/weapon/aiModule/syndicate" , "/obj/item/device/radio/beacon/syndicate") uses -= 7 if("/obj/item/weapon/gun/projectile") uses -= 6 if("/obj/item/weapon/gun/energy/crossbow" , "/obj/item/device/powersink") uses -= 5 - if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon" , "/obj/item/clothing/glasses/thermal") + if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon") uses -= 4 if("/obj/item/weapon/storage/emp_kit" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \ "/obj/item/weapon/card/id/syndicate" , "/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \ - "/obj/item/weapon/storage/syndie_kit/imp_freedom") + "/obj/item/weapon/storage/syndie_kit/imp_freedom" , "/obj/item/clothing/glasses/thermal") uses -= 3 if("/obj/item/ammo_magazine/a357" , "/obj/item/clothing/shoes/syndigaloshes" , "/obj/item/weapon/plastique") uses -= 2 diff --git a/code/defines/obj/clothing/jumpsuit.dm b/code/defines/obj/clothing/jumpsuit.dm index 524a5fce845..340f0acc404 100644 --- a/code/defines/obj/clothing/jumpsuit.dm +++ b/code/defines/obj/clothing/jumpsuit.dm @@ -273,12 +273,32 @@ permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) +//SKRUBS + +/obj/item/clothing/under/rank/medical/blue + name = "medical scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in baby blue." + icon_state = "scrubsblue" + color = "scrubsblue" + +/obj/item/clothing/under/rank/medical/green + name = "medical scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in dark green." + icon_state = "scrubsgreen" + color = "scrubsgreen" + +/obj/item/clothing/under/rank/medical/purple + name = "medical scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in deep purple." + icon_state = "scrubspurple" + color = "scrubspurple" + /obj/item/clothing/under/rank/chief_medical_officer desc = "It's a jumpsuit worn by those with the experience to be \"Chief Medical Officer\". It provides minor biological protection." name = "chief medical officer's jumpsuit" - icon_state = "medical" + icon_state = "cmo" item_state = "w_suit" - color = "medical" + color = "cmo" permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 10, rad = 0) @@ -294,16 +314,16 @@ /obj/item/clothing/under/rank/cargo name = "quartermaster's jumpsuit" desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by heavy lifting." - icon_state = "lightbrown" + icon_state = "qm" item_state = "lb_suit" - color = "cargo" + color = "qm" /obj/item/clothing/under/rank/cargotech - name = "cargotech's jumpsuit" - desc = "'Shooooorts! They're comfy and easy to wear!'" + name = "cargo technician's jumpsuit" + desc = "You can always count on brown" icon_state = "cargotech" - item_state = "cargotech" - color = "cargotech" + item_state = "lb_suit" + color = "cargo" /obj/item/clothing/under/rank/mailman name = "mailman's jumpsuit" diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index ef74260bb1b..2fb5fe1035a 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -51,12 +51,12 @@ Devices and Tools; /obj/item/weapon/card/emag:3:Cryptographic Sequencer; /obj/item/weapon/storage/toolbox/syndicate:1:Fully Loaded Toolbox; /obj/item/weapon/storage/syndie_kit/space:3:Space Suit; -/obj/item/clothing/glasses/thermal:4:Thermal Imaging Glasses; +/obj/item/clothing/glasses/thermal:3:Thermal Imaging Glasses; /obj/item/device/encryptionkey/binary:3:Binary Translator Key; /obj/item/weapon/aiModule/syndicate:7:Hacked AI Upload Module; /obj/item/weapon/plastique:2:C-4 (Destroys walls); /obj/item/device/powersink:5:Powersink (DANGER!); -/obj/machinery/singularity_beacon/syndicate:7:Singularity Beacon (DANGER!); +/obj/item/device/radio/beacon/syndicate:7:Singularity Beacon (DANGER!); /obj/item/weapon/circuitboard/teleporter:20:Teleporter Circuit Board; Whitespace:Seperator; Implants; diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index f1c35f89df6..e219092fa60 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -119,7 +119,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_if_possible(new /obj/item/device/radio/headset/headset_cargo(H), H.slot_ears) - H.equip_if_possible(new /obj/item/clothing/under/rank/cargo(H), H.slot_w_uniform) + H.equip_if_possible(new /obj/item/clothing/under/rank/cargotech(H), H.slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes) H.equip_if_possible(new /obj/item/device/pda/quartermaster(H), H.slot_belt) H.equip_if_possible(new /obj/item/clothing/gloves/black(H), H.slot_gloves) diff --git a/code/game/objects/closets/secure/cargo.dm b/code/game/objects/closets/secure/cargo.dm index d5f7ef8b521..50d1c15489e 100644 --- a/code/game/objects/closets/secure/cargo.dm +++ b/code/game/objects/closets/secure/cargo.dm @@ -13,7 +13,7 @@ New() ..() sleep(2) - new /obj/item/clothing/under/rank/cargo(src) + new /obj/item/clothing/under/rank/cargotech(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) diff --git a/code/game/objects/closets/secure/medical.dm b/code/game/objects/closets/secure/medical.dm index 0a2b55ec87e..25699178ba3 100644 --- a/code/game/objects/closets/secure/medical.dm +++ b/code/game/objects/closets/secure/medical.dm @@ -67,6 +67,9 @@ new /obj/item/weapon/storage/backpack/medic(src) new /obj/item/clothing/under/rank/nursesuit (src) new /obj/item/clothing/head/nursehat (src) + new /obj/item/clothing/under/rank/medical/purple(src) + new /obj/item/clothing/under/rank/medical/green(src) + new /obj/item/clothing/under/rank/medical/blue(src) new /obj/item/clothing/under/rank/medical(src) new /obj/item/clothing/suit/labcoat(src) new /obj/item/clothing/shoes/white(src) @@ -91,7 +94,7 @@ ..() sleep(2) new /obj/item/clothing/suit/bio_suit/cmo(src) - new /obj/item/clothing/head/bio_hood/general(src) + new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/under/rank/chief_medical_officer(src) new /obj/item/clothing/suit/labcoat/cmo(src) new /obj/item/weapon/cartridge/cmo(src) diff --git a/code/game/objects/radio/beacon.dm b/code/game/objects/radio/beacon.dm index 0aae0f9e698..1da6447a891 100644 --- a/code/game/objects/radio/beacon.dm +++ b/code/game/objects/radio/beacon.dm @@ -6,7 +6,6 @@ var/code = "electronic" origin_tech = "bluespace=1" - /obj/item/device/radio/beacon/hear_talk() return @@ -32,3 +31,19 @@ proc/digest_delay() spawn(600) del(src) + + +// SINGULO BEACON SPAWNER + +/obj/item/device/radio/beacon/syndicate + name = "suspicious beacon" + desc = "A label on it reads:'Activate to have a singularity beacon teleported to your location'." + origin_tech = "bluespace=1;syndicate=7" + +/obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob) + if(user) + user << "\blue Locked In" + new /obj/machinery/singularity_beacon/syndicate( user.loc ) + playsound(src, 'pop.ogg', 100, 1, 1) + del(src) + return \ No newline at end of file diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index 10d474956dd..4ebccc9dbc0 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -284,7 +284,7 @@ /obj/item/weapon/storage/box/syndicate/New() ..() - switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1))) + switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1))) if ("bloodyspai") new /obj/item/clothing/under/chameleon(src) new /obj/item/clothing/mask/gas/voice(src) @@ -317,6 +317,7 @@ new /obj/item/weapon/melee/energy/sword(src) new /obj/item/clothing/glasses/thermal(src) new /obj/item/weapon/card/emag(src) + new /obj/item/clothing/shoes/syndigaloshes(src) return if("freedom") @@ -326,6 +327,19 @@ U.imp = new /obj/item/weapon/implant/uplink(U) return + if ("hacker") + new /obj/item/weapon/aiModule/syndicate(src) + new /obj/item/weapon/card/emag(src) + new /obj/item/device/encryptionkey/binary(src) + return + + if ("lordsingulo") + new /obj/item/device/radio/beacon/syndicate(src) + new /obj/item/clothing/suit/space/syndicate(src) + new /obj/item/clothing/head/helmet/space/syndicate(src) + new /obj/item/weapon/card/emag(src) + return + /obj/item/weapon/storage/dice/New() new /obj/item/weapon/dice( src ) new /obj/item/weapon/dice/d20( src ) diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 2c461cd0f3c..86c44a3c2d9 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -62,6 +62,9 @@ /obj/item/clothing/suit/bio_suit/cmo icon_state = "bio_cmo" +/obj/item/clothing/head/bio_hood/cmo + icon_state = "bio_cmo" + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit name = "Plague doctor suit" diff --git a/html/changelog.html b/html/changelog.html index 5fb324b7928..72d26eac811 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -46,6 +46,18 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +