diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index bc3fa9ab1c9..68cde4d5541 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/paradise.dme b/paradise.dme index 2593ce0b4b0..c464a36695a 100644 --- a/paradise.dme +++ b/paradise.dme @@ -476,8 +476,8 @@ #include "code\datums\components\contsruction_regenerate.dm" #include "code\datums\components\conveyor_movement.dm" #include "code\datums\components\cross_shock.dm" -#include "code\datums\components\decal.dm" #include "code\datums\components\death_linked.dm" +#include "code\datums\components\decal.dm" #include "code\datums\components\defibrillator.dm" #include "code\datums\components\drift.dm" #include "code\datums\components\ducttape.dm" @@ -588,16 +588,16 @@ #include "code\datums\diseases\viruses\advance\symptoms\youth.dm" #include "code\datums\elements\_element.dm" #include "code\datums\elements\connect_loc.dm" -#include "code\datums\elements\devil_regen.dm" #include "code\datums\elements\devil_banishment.dm" +#include "code\datums\elements\devil_regen.dm" #include "code\datums\elements\falling_hazard.dm" #include "code\datums\elements\footstep.dm" #include "code\datums\elements\give_turf_traits.dm" #include "code\datums\elements\light_blocking.dm" #include "code\datums\elements\movetype_handler.dm" #include "code\datums\elements\openspace_item_click_handler.dm" -#include "code\datums\elements\ridable.dm" #include "code\datums\elements\reagent_attack.dm" +#include "code\datums\elements\ridable.dm" #include "code\datums\elements\simple_flying.dm" #include "code\datums\elements\squish.dm" #include "code\datums\elements\strippable.dm" @@ -1657,8 +1657,8 @@ #include "code\modules\antagonists\blob\structures\storage.dm" #include "code\modules\antagonists\borer\borer_action.dm" #include "code\modules\antagonists\borer\borer_datum.dm" -#include "code\modules\antagonists\borer\borer_rank.dm" #include "code\modules\antagonists\borer\borer_focus.dm" +#include "code\modules\antagonists\borer\borer_rank.dm" #include "code\modules\antagonists\borer\borer_reagent.dm" #include "code\modules\antagonists\borer\borer_spell.dm" #include "code\modules\antagonists\changeling\changeling_datum.dm" @@ -1688,19 +1688,19 @@ #include "code\modules\antagonists\changeling\powers\tiny_prick.dm" #include "code\modules\antagonists\changeling\powers\transform.dm" #include "code\modules\antagonists\devil\devil.dm" -#include "code\modules\antagonists\devil\sintouched.dm" -#include "code\modules\antagonists\devil\devil_banish.dm" -#include "code\modules\antagonists\devil\devil_bane.dm" #include "code\modules\antagonists\devil\devil_ban.dm" +#include "code\modules\antagonists\devil\devil_bane.dm" +#include "code\modules\antagonists\devil\devil_banish.dm" #include "code\modules\antagonists\devil\devil_info.dm" -#include "code\modules\antagonists\devil\devil_pawn.dm" -#include "code\modules\antagonists\devil\imp\imp.dm" #include "code\modules\antagonists\devil\devil_obligation.dm" +#include "code\modules\antagonists\devil\devil_outfit.dm" +#include "code\modules\antagonists\devil\devil_pawn.dm" #include "code\modules\antagonists\devil\devil_rank.dm" #include "code\modules\antagonists\devil\devil_ritual.dm" -#include "code\modules\antagonists\devil\devil_outfit.dm" #include "code\modules\antagonists\devil\helper_procs.dm" +#include "code\modules\antagonists\devil\sintouched.dm" #include "code\modules\antagonists\devil\contracts\friend.dm" +#include "code\modules\antagonists\devil\imp\imp.dm" #include "code\modules\antagonists\devil\true_devil\_true_devil.dm" #include "code\modules\antagonists\malf_ai\malf_ai_datum.dm" #include "code\modules\antagonists\space_dragon\action.dm" @@ -1963,8 +1963,8 @@ #include "code\modules\client\message.dm" #include "code\modules\client\ping.dm" #include "code\modules\client\view.dm" -#include "code\modules\client\preference\preferences.dm" #include "code\modules\client\preference\preference_info.dm" +#include "code\modules\client\preference\preferences.dm" #include "code\modules\client\preference\preferences_mysql.dm" #include "code\modules\client\preference\preferences_spawnpoints.dm" #include "code\modules\client\preference\preferences_toggles.dm" @@ -3261,8 +3261,8 @@ #include "code\modules\tgui\states\strippable_state.dm" #include "code\modules\tgui\states\zlevel.dm" #include "code\modules\tgui\tgui_input\alert_input.dm" -#include "code\modules\tgui\tgui_input\input_checkbox.dm" #include "code\modules\tgui\tgui_input\color_input.dm" +#include "code\modules\tgui\tgui_input\input_checkbox.dm" #include "code\modules\tgui\tgui_input\keycombo_input.dm" #include "code\modules\tgui\tgui_input\list_input.dm" #include "code\modules\tgui\tgui_input\number_input.dm"