From e1dc0ef51bd64b2618231fabd25152316d74d064 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 14 Feb 2019 17:03:42 -0500 Subject: [PATCH 1/5] Update uplink_items.dm --- code/modules/uplink/uplink_items.dm | 32 +++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 32eaf0cde9..b708ca75dc 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1355,13 +1355,28 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/reverse_bear_trap restricted_roles = list("Clown") +/datum/uplink_item/role_restricted/clumsyDNA + name = "Clumsy Clown DNA" + desc = "A DNA inject that has been loaded with the clown gene that makes people clumsy. \ + Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try useing this on HOS to see how many times they shoot themselfs in the foot!" + cost = 3 + item = /obj/item/dnainjector/clumsymut + restricted_roles = list("Clown") + +/datum/uplink_item/role_restricted/anitclumsyDNA + name = "Clown punishment" + desc = "HONK Looks like one of are angents got, got! \ + We got a barrle of laughs for you, HONK, we got a Mime DNA injector HONK! Use this on a clown HONK to make them not clusmy HONK!" + cost = 1 //If Hos or warden gets a uplink they should be able to get it for allmost free + item = /obj/item/dnainjector/clumsymut + restricted_roles = list("Warden", "Head of Security") + /datum/uplink_item/role_restricted/mimery name = "Guide to Advanced Mimery Series" desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. Obviously only works for Mimes." cost = 12 item = /obj/item/storage/box/syndie_kit/mimery restricted_roles = list("Mime") - surplus = 0 /datum/uplink_item/role_restricted/ez_clean_bundle name = "EZ Clean Grenade Bundle" @@ -1383,7 +1398,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Kitchen Gun (TM) .45 Magazine" desc = "An extra eight bullets for an extra eight uses of Kitchen Gun (TM)!" cost = 1 - surplus = 0 restricted_roles = list("Cook", "Janitor") item = /obj/item/ammo_box/magazine/m45/kitchengun @@ -1392,7 +1406,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead." item = /obj/item/hot_potato/syndicate cost = 4 - surplus = 0 restricted_roles = list("Cook", "Botanist", "Clown", "Mime") /datum/uplink_item/role_restricted/his_grace @@ -1412,7 +1425,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 10 item = /obj/item/pneumatic_cannon/pie/selfcharge restricted_roles = list("Clown") - surplus = 0 //No fun unless you're the clown! /datum/uplink_item/role_restricted/ancient_jumpsuit name = "Ancient Jumpsuit" @@ -1420,7 +1432,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/clothing/under/color/grey/glorf cost = 20 restricted_roles = list("Assistant") - surplus = 0 /datum/uplink_item/role_restricted/brainwash_disk name = "Brainwashing Surgery Program" @@ -1474,7 +1485,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield." item = /obj/item/gun/blastcannon - cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist. + cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled gas masked scientist. restricted_roles = list("Research Director", "Scientist") /datum/uplink_item/device_tools/clown_bomb @@ -1487,6 +1498,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/sbeacondrop/clownbomb cost = 15 restricted_roles = list("Clown") + +/datum/uplink_item/device_tools/honkpins //Idealy so they can place it into their own guns without needing cargo + name = "Hilarious firing pin" + desc = "A single firing pin made for Clown agents, this firing pin makes any gun honk when fired if not a true clown! \ + This firing pin also helps you fire the gun correctly. May the HonkMother HONK you agent." + item = /obj/item/firing_pin/clown + cost = 1 + restricted_roles = list("Clown") + /* /datum/uplink_item/role_restricted/clowncar name = "Clown Car" From 0379bd2b89c706831b147b28a106ff0748004a9c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 14 Feb 2019 17:10:45 -0500 Subject: [PATCH 2/5] grammar what is that? --- code/modules/uplink/uplink_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index b708ca75dc..7a88ba1807 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1357,7 +1357,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/role_restricted/clumsyDNA name = "Clumsy Clown DNA" - desc = "A DNA inject that has been loaded with the clown gene that makes people clumsy. \ + desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy. \ Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try useing this on HOS to see how many times they shoot themselfs in the foot!" cost = 3 item = /obj/item/dnainjector/clumsymut From 4e68eebe2a03ed6ea78375b98612355d1aa2d09a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 14 Feb 2019 19:09:57 -0500 Subject: [PATCH 3/5] Grammar isnt a thing cats do --- code/modules/uplink/uplink_items.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 7a88ba1807..38f7d5cc95 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1357,15 +1357,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/role_restricted/clumsyDNA name = "Clumsy Clown DNA" - desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy. \ - Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try useing this on HOS to see how many times they shoot themselfs in the foot!" + desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \ + Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!" cost = 3 item = /obj/item/dnainjector/clumsymut restricted_roles = list("Clown") /datum/uplink_item/role_restricted/anitclumsyDNA name = "Clown punishment" - desc = "HONK Looks like one of are angents got, got! \ + desc = "HONK! Looks like one of our agents got got! \ We got a barrle of laughs for you, HONK, we got a Mime DNA injector HONK! Use this on a clown HONK to make them not clusmy HONK!" cost = 1 //If Hos or warden gets a uplink they should be able to get it for allmost free item = /obj/item/dnainjector/clumsymut From c9c185b3e1523a7305d8afc217e165974219e4c6 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 14 Feb 2019 19:12:10 -0500 Subject: [PATCH 4/5] 2 out of 5 --- code/modules/uplink/uplink_items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 38f7d5cc95..37a87a3dd3 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1366,8 +1366,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/role_restricted/anitclumsyDNA name = "Clown punishment" desc = "HONK! Looks like one of our agents got got! \ - We got a barrle of laughs for you, HONK, we got a Mime DNA injector HONK! Use this on a clown HONK to make them not clusmy HONK!" - cost = 1 //If Hos or warden gets a uplink they should be able to get it for allmost free + We got a barrel of laughs for you, HONK, we got a Mime DNA injector HONK! Use this on a clown HONK to make them not clumsy HONK!" + cost = 1 //If Hos or warden gets an uplink they should be able to get it for almost free item = /obj/item/dnainjector/clumsymut restricted_roles = list("Warden", "Head of Security") From b4d22822cbcd0f237403e359d5dc4003f96d8df0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 22 Feb 2019 11:01:18 -0500 Subject: [PATCH 5/5] As kev requested --- code/modules/uplink/uplink_items.dm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 37a87a3dd3..9cbb1cd07e 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1359,18 +1359,10 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) name = "Clumsy Clown DNA" desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \ Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!" - cost = 3 + cost = 1 item = /obj/item/dnainjector/clumsymut restricted_roles = list("Clown") -/datum/uplink_item/role_restricted/anitclumsyDNA - name = "Clown punishment" - desc = "HONK! Looks like one of our agents got got! \ - We got a barrel of laughs for you, HONK, we got a Mime DNA injector HONK! Use this on a clown HONK to make them not clumsy HONK!" - cost = 1 //If Hos or warden gets an uplink they should be able to get it for almost free - item = /obj/item/dnainjector/clumsymut - restricted_roles = list("Warden", "Head of Security") - /datum/uplink_item/role_restricted/mimery name = "Guide to Advanced Mimery Series" desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. Obviously only works for Mimes."