From 403f4336db7a9a13394319de0ff352f44057e8da Mon Sep 17 00:00:00 2001 From: Chemlight Date: Fri, 15 Jan 2021 04:25:16 -0800 Subject: [PATCH] Lotsa bus implants and ATV supply n' demand Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves). Also ATV's are too easy to get, make it need effort to buy and become speed racer. --- .../objects/items/implants/implant_CQC.dm | 38 +++++++++++++++++++ .../items/implants/implant_krav_maga.dm | 4 +- .../items/implants/implant_mushpunch.dm | 38 +++++++++++++++++++ .../items/implants/implant_plasmafist.dm | 38 +++++++++++++++++++ .../items/implants/implant_psychobrawl.dm | 38 +++++++++++++++++++ .../items/implants/implant_sleepingcarp.dm | 38 +++++++++++++++++++ .../items/implants/implant_wrestling.dm | 38 +++++++++++++++++++ code/modules/cargo/packs/emergency.dm | 2 +- tgstation.dme | 6 +++ 9 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 code/game/objects/items/implants/implant_CQC.dm create mode 100644 code/game/objects/items/implants/implant_mushpunch.dm create mode 100644 code/game/objects/items/implants/implant_plasmafist.dm create mode 100644 code/game/objects/items/implants/implant_psychobrawl.dm create mode 100644 code/game/objects/items/implants/implant_sleepingcarp.dm create mode 100644 code/game/objects/items/implants/implant_wrestling.dm diff --git a/code/game/objects/items/implants/implant_CQC.dm b/code/game/objects/items/implants/implant_CQC.dm new file mode 100644 index 00000000..563a1600 --- /dev/null +++ b/code/game/objects/items/implants/implant_CQC.dm @@ -0,0 +1,38 @@ +/obj/item/implant/cqc + name = "CQC implant" + desc = "Teaches you the arts of CQC in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/library.dmi' + icon_state ="cqcmanual" + activated = 1 + var/datum/martial_art/cqc/style = new + +/obj/item/implant/cqc/get_data() + var/dat = {"Implant Specifications:
+ Name: CQC Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of CQC."} + return dat + +/obj/item/implant/cqc/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_CQC)) + style.remove(H) + to_chat(H, "You forget the basics of CQC.") + else + style.teach(H,1) + to_chat(H, "You remember the basics of CQC!") + +/obj/item/implanter/cqc + name = "implanter (CQC)" + imp_type = /obj/item/implant/cqc + +/obj/item/implantcase/cqc + name = "implant case - 'CQC'" + desc = "A glass case containing an implant that can teach the user the arts of CQC." + imp_type = /obj/item/implant/cqc diff --git a/code/game/objects/items/implants/implant_krav_maga.dm b/code/game/objects/items/implants/implant_krav_maga.dm index 373658b3..13bd4afa 100644 --- a/code/game/objects/items/implants/implant_krav_maga.dm +++ b/code/game/objects/items/implants/implant_krav_maga.dm @@ -1,8 +1,8 @@ /obj/item/implant/krav_maga name = "krav maga implant" desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs." - icon = 'icons/obj/wizard.dmi' - icon_state ="scroll2" + icon = 'icons/obj/clothing/gloves.dmi' + icon_state ="fightgloves" activated = 1 var/datum/martial_art/krav_maga/style = new diff --git a/code/game/objects/items/implants/implant_mushpunch.dm b/code/game/objects/items/implants/implant_mushpunch.dm new file mode 100644 index 00000000..b7f0a689 --- /dev/null +++ b/code/game/objects/items/implants/implant_mushpunch.dm @@ -0,0 +1,38 @@ +/obj/item/implant/mushpunch + name = "Mushroom Punch implant" + desc = "Teaches you the arts of Mushroom Punch in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state ="angel" + activated = 1 + var/datum/martial_art/mushpunch/style = new + +/obj/item/implant/mushpunch/get_data() + var/dat = {"Implant Specifications:
+ Name: Mushroom Punch Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Mushroom Punch."} + return dat + +/obj/item/implant/mushpunch/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_MUSHPUNCH)) + style.remove(H) + to_chat(H, "You forget the teachings of Mushroom Punch.") + else + style.teach(H,1) + to_chat(H, "You learn the arts of Mushroom Punch!") + +/obj/item/implanter/mushpunch + name = "implanter (Mushroom Punch)" + imp_type = /obj/item/implant/mushpunch + +/obj/item/implantcase/mushpunch + name = "implant case - 'Mushroom Punch'" + desc = "A glass case containing an implant that can teach the user the arts of Mushroom Punch." + imp_type = /obj/item/implant/mushpunch diff --git a/code/game/objects/items/implants/implant_plasmafist.dm b/code/game/objects/items/implants/implant_plasmafist.dm new file mode 100644 index 00000000..7d6bccaa --- /dev/null +++ b/code/game/objects/items/implants/implant_plasmafist.dm @@ -0,0 +1,38 @@ +/obj/item/implant/plasmafist + name = "Plasma Fist implant" + desc = "Teaches you the arts of Plasma Fist in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state ="disintegrate" + activated = 1 + var/datum/martial_art/plasma_fist/style = new + +/obj/item/implant/plasmafist/get_data() + var/dat = {"Implant Specifications:
+ Name: Plasma Fist Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Plasma Fist."} + return dat + +/obj/item/implant/plasmafist/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_PLASMAFIST)) + style.remove(H) + to_chat(H, "You forget the teachings of the Plasma Fist.") + else + style.teach(H,1) + to_chat(H, "You learn the arts of the Plasma Fist!") + +/obj/item/implanter/plasmafist + name = "implanter (Plasma Fist)" + imp_type = /obj/item/implant/plasmafist + +/obj/item/implantcase/plasmafist + name = "implant case - 'Plasma Fist'" + desc = "A glass case containing an implant that can teach the user the arts of Plasma Fist." + imp_type = /obj/item/implant/plasmafist diff --git a/code/game/objects/items/implants/implant_psychobrawl.dm b/code/game/objects/items/implants/implant_psychobrawl.dm new file mode 100644 index 00000000..4091879d --- /dev/null +++ b/code/game/objects/items/implants/implant_psychobrawl.dm @@ -0,0 +1,38 @@ +/obj/item/implant/psychobrawl + name = "Psychotic Brawling implant" + desc = "Teaches you the arts of Psychotic Brawling in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/surgery.dmi' + icon_state ="brain" + activated = 1 + var/datum/martial_art/psychotic_brawling/style = new + +/obj/item/implant/psychobrawl/get_data() + var/dat = {"Implant Specifications:
+ Name: Psychotic Brawling Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Psychotic Brawling."} + return dat + +/obj/item/implant/psychobrawl/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_PSYCHOBRAWL)) + style.remove(H) + to_chat(H, "You forget the teachings of Psychotic Brawling.") + else + style.teach(H,1) + to_chat(H, "You learn the arts of Psychotic Brawling!") + +/obj/item/implanter/psychobrawl + name = "implanter (Psychotic Brawling)" + imp_type = /obj/item/implant/psychobrawl + +/obj/item/implantcase/psychobrawl + name = "implant case - 'Psychotic Brawling'" + desc = "A glass case containing an implant that can teach the user the arts of Psychotic Brawling." + imp_type = /obj/item/implant/psychobrawl diff --git a/code/game/objects/items/implants/implant_sleepingcarp.dm b/code/game/objects/items/implants/implant_sleepingcarp.dm new file mode 100644 index 00000000..e1ef60e1 --- /dev/null +++ b/code/game/objects/items/implants/implant_sleepingcarp.dm @@ -0,0 +1,38 @@ +/obj/item/implant/sleepingcarp + name = "Sleeping Carp implant" + desc = "Teaches you the arts of Sleeping Carp in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/wizard.dmi' + icon_state ="scroll2" + activated = 1 + var/datum/martial_art/the_sleeping_carp/style = new + +/obj/item/implant/sleepingcarp/get_data() + var/dat = {"Implant Specifications:
+ Name: Sleeping Carp Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Sleeping Carp."} + return dat + +/obj/item/implant/sleepingcarp/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_SLEEPINGCARP)) + style.remove(H) + to_chat(H, "You forget the teachings of the Sleeping Carp.") + else + style.teach(H,1) + to_chat(H, "You learn the arts of the Sleeping Carp!") + +/obj/item/implanter/sleepingcarp + name = "implanter (Sleeping Carp)" + imp_type = /obj/item/implant/sleepingcarp + +/obj/item/implantcase/sleepingcarp + name = "implant case - 'Sleeping Carp'" + desc = "A glass case containing an implant that can teach the user the arts of Sleeping Carp." + imp_type = /obj/item/implant/sleepingcarp diff --git a/code/game/objects/items/implants/implant_wrestling.dm b/code/game/objects/items/implants/implant_wrestling.dm new file mode 100644 index 00000000..58cfcbfe --- /dev/null +++ b/code/game/objects/items/implants/implant_wrestling.dm @@ -0,0 +1,38 @@ +/obj/item/implant/wrestling + name = "Wrestling implant" + desc = "Teaches you the arts of Wrestling in 5 short instructional videos beamed directly into your eyeballs." + icon = 'icons/obj/clothing/masks.dmi' + icon_state ="luchador" + activated = 1 + var/datum/martial_art/wrestling/style = new + +/obj/item/implant/wrestling/get_data() + var/dat = {"Implant Specifications:
+ Name: Wrestling Implant
+ Life: 4 hours after death of host
+ Implant Details:
+ Function: Teaches even the clumsiest host the arts of Wrestling."} + return dat + +/obj/item/implant/wrestling/activate() + . = ..() + var/mob/living/carbon/human/H = imp_in + if(!ishuman(H)) + return + if(!H.mind) + return + if(H.mind.has_martialart(MARTIALART_WRESTLING)) + style.remove(H) + to_chat(H, "You forget the teachings of Wrestling.") + else + style.teach(H,1) + to_chat(H, "You learn the arts of Wrestling!") + +/obj/item/implanter/wrestling + name = "implanter (Wrestling)" + imp_type = /obj/item/implant/wrestling + +/obj/item/implantcase/wrestling + name = "implant case - 'Wrestling'" + desc = "A glass case containing an implant that can teach the user the arts of Wrestling." + imp_type = /obj/item/implant/wrestling diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index eba56379..0676e74e 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -12,7 +12,7 @@ /datum/supply_pack/emergency/vehicle name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN desc = "TUNNEL SNAKES OWN THIS TOWN. Contains an unbranded All Terrain Vehicle, and a complete gang outfit -- consists of black gloves, a menacing skull bandanna, and a SWEET leather overcoat!" - cost = 2500 + cost = 7500 contraband = TRUE contains = list(/obj/vehicle/ridden/atv, /obj/item/key, diff --git a/tgstation.dme b/tgstation.dme index c163de3d..e29c8f05 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -941,19 +941,25 @@ #include "code\game\objects\items\implants\implant_abductor.dm" #include "code\game\objects\items\implants\implant_chem.dm" #include "code\game\objects\items\implants\implant_clown.dm" +#include "code\game\objects\items\implants\implant_CQC.dm" #include "code\game\objects\items\implants\implant_exile.dm" #include "code\game\objects\items\implants\implant_explosive.dm" #include "code\game\objects\items\implants\implant_freedom.dm" #include "code\game\objects\items\implants\implant_krav_maga.dm" #include "code\game\objects\items\implants\implant_mindshield.dm" #include "code\game\objects\items\implants\implant_misc.dm" +#include "code\game\objects\items\implants\implant_mushpunch.dm" +#include "code\game\objects\items\implants\implant_plasmafist.dm" +#include "code\game\objects\items\implants\implant_psychobrawl.dm" #include "code\game\objects\items\implants\implant_radio.dm" #include "code\game\objects\items\implants\implant_slave.dm" +#include "code\game\objects\items\implants\implant_sleepingcarp.dm" #include "code\game\objects\items\implants\implant_spell.dm" #include "code\game\objects\items\implants\implant_stealth.dm" #include "code\game\objects\items\implants\implant_storage.dm" #include "code\game\objects\items\implants\implant_track.dm" #include "code\game\objects\items\implants\implant_uplink.dm" +#include "code\game\objects\items\implants\implant_wrestling.dm" #include "code\game\objects\items\implants\implantcase.dm" #include "code\game\objects\items\implants\implantchair.dm" #include "code\game\objects\items\implants\implanter.dm"