From 1bb8ff1c0ca56b1c1c49fc8c59d1e920b51d1872 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 17 Nov 2019 15:08:30 +0300 Subject: [PATCH 1/3] Fixes loadout name, adds DAB outfit crate to cargo For "recruitment" on-station. --- code/modules/cargo/packs/costumes_toys.dm | 18 ++++++++++++++++++ code/modules/clothing/suits/miscellaneous.dm | 2 +- .../code/modules/client/loadout/_service.dm | 4 ++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index 40d21e4505..60273dbf4f 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -81,6 +81,24 @@ /obj/item/gun/ballistic/shotgun/toy) crate_name = "foam force crate" +/datum/supply_pack/costumes_toys/neetcrate + name = "D.A.B. Outfit Crate" + desc = "When you want to recruit more \"troopers\" for useless activity. Enough for a whole squad of 6!" + cost = 1000 + contains = list(/obj/item/clothing/suit/assu_suit, + /obj/item/clothing/suit/assu_suit, + /obj/item/clothing/suit/assu_suit, + /obj/item/clothing/suit/assu_suit, + /obj/item/clothing/suit/assu_suit, + /obj/item/clothing/suit/assu_suit, + /obj/item/clothing/head/assu_helmet, + /obj/item/clothing/head/assu_helmet, + /obj/item/clothing/head/assu_helmet, + /obj/item/clothing/head/assu_helmet, + /obj/item/clothing/head/assu_helmet, + /obj/item/clothing/head/assu_helmet) + crate_name = "dab outfit crate" + /datum/supply_pack/costumes_toys/foamforce/bonus name = "Foam Force Pistols Crate" desc = "Psst.. hey bud... remember those old foam force pistols that got discontinued for being too cool? Well I got two of those right here with your name on em. I'll even throw in a spare mag for each, waddya say?" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a18617ea29..2a8d762ec0 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -636,7 +636,7 @@ /obj/item/clothing/suit/assu_suit name = "DAB suit" - desc = "A cheap replica of old SWAT armor. On its back, it is written: \"Desperate Assistance Battle-force\"." + desc = "A cheap replica of old SWAT armor. On its back, it is written: \"Desperate Assistance Battleforce\"." icon_state = "assu_suit" item_state = "assu_suit" blood_overlay_type = "armor" diff --git a/modular_citadel/code/modules/client/loadout/_service.dm b/modular_citadel/code/modules/client/loadout/_service.dm index 7872ddcf99..86823f5661 100644 --- a/modular_citadel/code/modules/client/loadout/_service.dm +++ b/modular_citadel/code/modules/client/loadout/_service.dm @@ -5,14 +5,14 @@ restricted_roles = list("Assistant") /datum/gear/neetsuit - name = "ASSU suit" + name = "D.A.B. suit" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/assu_suit restricted_roles = list("Assistant") cost = 2 /datum/gear/neethelm - name = "ASSU helmet" + name = "D.A.B. helmet" category = SLOT_HEAD path = /obj/item/clothing/head/assu_helmet restricted_roles = list("Assistant") From 8f7571a115be2e58d75057313acd8ebe3d1a6782 Mon Sep 17 00:00:00 2001 From: NopemanMcHalt <36963049+NopemanMcHalt@users.noreply.github.com> Date: Sun, 17 Nov 2019 18:18:20 +0300 Subject: [PATCH 2/3] Don't do webedits, folks I mean seriously it's quick but there's chance of fucking up something --- code/modules/cargo/packs/costumes_toys.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index 60273dbf4f..5d5ea97a41 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -84,7 +84,7 @@ /datum/supply_pack/costumes_toys/neetcrate name = "D.A.B. Outfit Crate" desc = "When you want to recruit more \"troopers\" for useless activity. Enough for a whole squad of 6!" - cost = 1000 + cost = 1200 contains = list(/obj/item/clothing/suit/assu_suit, /obj/item/clothing/suit/assu_suit, /obj/item/clothing/suit/assu_suit, From b714c32ca290220a55bb9faa18e4c55aa1afe51c Mon Sep 17 00:00:00 2001 From: Anonymous Date: Sun, 17 Nov 2019 19:44:22 +0300 Subject: [PATCH 3/3] Partly Reverts "Fixes loadout name, adds DAB outf- it crate to cargo" This reverts commit 1bb8ff1c0ca56b1c1c49fc8c59d1e920b51d1872. Removes cargo changes. In other news, I can't please everyone and I hate society, thank you for coming to my TED Talk. --- code/modules/cargo/packs/costumes_toys.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index 5d5ea97a41..40d21e4505 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -81,24 +81,6 @@ /obj/item/gun/ballistic/shotgun/toy) crate_name = "foam force crate" -/datum/supply_pack/costumes_toys/neetcrate - name = "D.A.B. Outfit Crate" - desc = "When you want to recruit more \"troopers\" for useless activity. Enough for a whole squad of 6!" - cost = 1200 - contains = list(/obj/item/clothing/suit/assu_suit, - /obj/item/clothing/suit/assu_suit, - /obj/item/clothing/suit/assu_suit, - /obj/item/clothing/suit/assu_suit, - /obj/item/clothing/suit/assu_suit, - /obj/item/clothing/suit/assu_suit, - /obj/item/clothing/head/assu_helmet, - /obj/item/clothing/head/assu_helmet, - /obj/item/clothing/head/assu_helmet, - /obj/item/clothing/head/assu_helmet, - /obj/item/clothing/head/assu_helmet, - /obj/item/clothing/head/assu_helmet) - crate_name = "dab outfit crate" - /datum/supply_pack/costumes_toys/foamforce/bonus name = "Foam Force Pistols Crate" desc = "Psst.. hey bud... remember those old foam force pistols that got discontinued for being too cool? Well I got two of those right here with your name on em. I'll even throw in a spare mag for each, waddya say?"