Skip to content

Commit

Permalink
Pimp my drip (ParadiseSS13#21527)
Browse files Browse the repository at this point in the history
* first changes, lest see bugs

* fix

* minor sprite fixes

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: S34N <[email protected]>

* update

* mhm

---------

Co-authored-by: S34N <[email protected]>
  • Loading branch information
McRamon and S34NW authored Jul 31, 2023
1 parent 9186b7d commit fce54de
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 6 deletions.
11 changes: 11 additions & 0 deletions code/modules/clothing/suits/misc_suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/supply/supply_packs/pack_miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified icons/mob/clothing/species/drask/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/grey/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/kidan/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/species/vox/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
12 changes: 6 additions & 6 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1837,20 +1837,25 @@
#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"
#include "code\modules\martial_arts\combos\cqc\kick.dm"
#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"
Expand All @@ -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"
Expand Down

0 comments on commit fce54de

Please sign in to comment.