diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index df8e5c658cb..a30ff9a00f6 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -386,6 +386,17 @@ sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') +/obj/item/clothing/suit/pimpcoat + name = "expensive coat" + desc = "Very fluffy pink coat, made out of very expensive fur (clearly)." + icon_state = "pimpcoat" + item_state = "pimpcoat" + blood_overlay_type = "armor" + body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO + allowed = list(/obj/item/tank/internals/emergency_oxygen) + cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT + /obj/item/clothing/suit/furcoat name = "fur coat" desc = "A trenchcoat made from fur. You could put an oxygen tank in one of the pockets." diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 4d0f5667ec2..d9590384b52 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -351,6 +351,12 @@ containername = "flags crate" contraband = TRUE +/datum/supply_packs/misc/pimpcoat + name = "Very Expensive Coat for Rich People" + contains = list(/obj/item/clothing/suit/pimpcoat) + cost = 1000 + containername = "expensive coat crate" + /datum/supply_packs/misc/formalwear //This is a very classy crate. name = "Formal Wear Crate" contains = list(/obj/item/clothing/under/dress/blacktango, diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index 282bdfdb940..673d0a68977 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 10a51712fcc..be7f5a16ee3 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index 4f5d6a4245d..7e04724b7af 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 9e1b7352832..4888c946b23 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 07646d15de5..6c4554f0ada 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f179ee7e660..54cb05d07c7 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/paradise.dme b/paradise.dme index cd256b5044f..7e83083779f 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1837,13 +1837,13 @@ #include "code\modules\martial_arts\brawling.dm" #include "code\modules\martial_arts\cqc.dm" #include "code\modules\martial_arts\grav_stomp.dm" +#include "code\modules\martial_arts\judo.dm" #include "code\modules\martial_arts\krav_maga.dm" #include "code\modules\martial_arts\martial.dm" #include "code\modules\martial_arts\mimejutsu.dm" #include "code\modules\martial_arts\plasma_fist.dm" #include "code\modules\martial_arts\sleeping_carp.dm" #include "code\modules\martial_arts\wrestling.dm" -#include "code\modules\martial_arts\judo.dm" #include "code\modules\martial_arts\combos\martial_combo.dm" #include "code\modules\martial_arts\combos\adminfu\healing_palm.dm" #include "code\modules\martial_arts\combos\cqc\consecutive.dm" @@ -1851,6 +1851,11 @@ #include "code\modules\martial_arts\combos\cqc\pressure.dm" #include "code\modules\martial_arts\combos\cqc\restrain.dm" #include "code\modules\martial_arts\combos\cqc\slam.dm" +#include "code\modules\martial_arts\combos\judo\armbar.dm" +#include "code\modules\martial_arts\combos\judo\discombobulate.dm" +#include "code\modules\martial_arts\combos\judo\eyepoke.dm" +#include "code\modules\martial_arts\combos\judo\judothrow.dm" +#include "code\modules\martial_arts\combos\judo\wheelthrow.dm" #include "code\modules\martial_arts\combos\krav_maga\leg_sweep.dm" #include "code\modules\martial_arts\combos\krav_maga\lung_punch.dm" #include "code\modules\martial_arts\combos\krav_maga\neck_chop.dm" @@ -1863,11 +1868,6 @@ #include "code\modules\martial_arts\combos\sleeping_carp\crashing_kick.dm" #include "code\modules\martial_arts\combos\sleeping_carp\gnashing_teeth.dm" #include "code\modules\martial_arts\combos\sleeping_carp\keelhaul.dm" -#include "code\modules\martial_arts\combos\judo\discombobulate.dm" -#include "code\modules\martial_arts\combos\judo\eyepoke.dm" -#include "code\modules\martial_arts\combos\judo\judothrow.dm" -#include "code\modules\martial_arts\combos\judo\armbar.dm" -#include "code\modules\martial_arts\combos\judo\wheelthrow.dm" #include "code\modules\maze_generation\maze_generator.dm" #include "code\modules\maze_generation\maze_generator_blockwise.dm" #include "code\modules\maze_generation\maze_helper_atoms.dm"