Мержовое.

Kush1Push1 · Mar 13, 2024 · e689725 · e689725
1 parent ee93000
commit e689725
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 43 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/skelter.dmm b/_maps/RandomRuins/SpaceRuins/skelter.dmm
@@ -3257,7 +3257,7 @@
 	},
 /obj/structure/closet,
 /obj/effect/turf_decal/bot,
-/obj/item/circlegame,
+/obj/item/hand_item/circlegame,
 /turf/open/floor/plasteel/dark,
 /area/ruin/space/has_grav/skelter/storage)
 "hE" = (

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -50609,7 +50609,7 @@
 	c_tag = "Brig Infirmary";
 	dir = 4
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel,
 /area/security/brig)
 "jva" = (
@@ -50674,7 +50674,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel,
 /area/security/brig)
 "jwW" = (

diff --git a/_maps/map_files/BoxedInStation/BoxedInStation.dmm b/_maps/map_files/BoxedInStation/BoxedInStation.dmm
@@ -45103,7 +45103,7 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /obj/item/clothing/head/helmet/brigdoc,
 /obj/machinery/recharger{
 	pixel_x = 6;

diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -77886,7 +77886,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "hiL" = (
@@ -123125,7 +123125,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "vqE" = (

diff --git a/_maps/map_files/IceBox/IceBoxStation.dmm b/_maps/map_files/IceBox/IceBoxStation.dmm
@@ -41085,7 +41085,7 @@
 /obj/structure/window/reinforced,
 /obj/structure/rack,
 /obj/item/clothing/head/helmet/brigdoc,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "omG" = (
@@ -58485,9 +58485,6 @@
 /obj/machinery/computer/slot_machine,
 /turf/open/floor/wood,
 /area/command/meeting_room)
-"ujO" = (
-/turf/open/floor/wood,
-/area/commons/fitness/recreation)
 "ukr" = (
 /obj/machinery/cryopod/tele,
 /turf/open/floor/carpet,
@@ -102399,7 +102396,7 @@ nuh
 nuh
 ndk
 dqd
-ujO
+dqd
 eTv
 ouJ
 ouJ
@@ -102656,7 +102653,7 @@ rTU
 rTU
 rTU
 izm
-ujO
+dqd
 eTv
 eBV
 ouJ
@@ -103170,7 +103167,7 @@ oCx
 yhF
 ylK
 rjz
-ujO
+dqd
 eTv
 jDE
 ouJ

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -80946,7 +80946,7 @@
 	c_tag = "Security Infirmary";
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/warden)
 "cLy" = (
@@ -83454,7 +83454,7 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 24
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/warden)
 "jMz" = (

diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm
@@ -10959,7 +10959,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "auo" = (
@@ -11503,7 +11503,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "avj" = (

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -66360,7 +66360,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "mlA" = (
@@ -90265,7 +90265,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "xnd" = (

diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -35841,7 +35841,7 @@
 	},
 /obj/structure/closet/secure_closet/brigdoc,
 /obj/item/clothing/head/helmet/brigdoc,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /obj/machinery/light{
 	dir = 8
 	},

diff --git a/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm b/_maps/map_files/PeaceSyndicateStation/PeaceSyndicateBoxStation.dmm
@@ -53293,7 +53293,7 @@
 	c_tag = "Brig Infirmary";
 	dir = 4
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "fFR" = (
@@ -56821,7 +56821,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "kmw" = (

diff --git a/_maps/map_files/PrisonStation/PrisonStation.dmm b/_maps/map_files/PrisonStation/PrisonStation.dmm
@@ -1828,7 +1828,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /obj/item/defibrillator/loaded,
 /obj/item/stock_parts/cell/bluespacereactor,
 /turf/open/floor/plasteel/dark,

diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -51040,7 +51040,7 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "dYe" = (
@@ -62054,7 +62054,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/white,
 /area/security/brig)
 "tyL" = (

diff --git a/_maps/map_files/RatvarStation/RatvarStation.dmm b/_maps/map_files/RatvarStation/RatvarStation.dmm
@@ -66393,7 +66393,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/clockwork/reebe,
 /area/security/brig)
 "nZS" = (
@@ -82231,7 +82231,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/clockwork/reebe,
 /area/security/brig)
 "wxA" = (

diff --git a/_maps/map_files/SpookyStation/SpookyStation.dmm b/_maps/map_files/SpookyStation/SpookyStation.dmm
@@ -5184,7 +5184,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/clothing/head/helmet/space/hardsuit/deathsquad,
 /obj/item/clothing/suit/space/hardsuit/deathsquad,
-/obj/item/circlegame,
+/obj/item/hand_item/circlegame,
 /obj/item/nullrod/scythe,
 /obj/item/card/id/silver/reaper,
 /turf/open/floor/wood,

diff --git a/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm b/_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm
@@ -53137,7 +53137,7 @@
 	c_tag = "Brig Infirmary";
 	dir = 4
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "fFR" = (
@@ -56600,7 +56600,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "kmw" = (

diff --git a/_maps/map_files/TauStation/TauStation.dmm b/_maps/map_files/TauStation/TauStation.dmm
@@ -3399,7 +3399,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/tile/red,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/brig)
 "bhU" = (
@@ -41332,7 +41332,7 @@
 /turf/open/floor/plasteel,
 /area/cargo/storage)
 "omF" = (
-/obj/item/circlegame,
+/obj/item/hand_item/circlegame,
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},
@@ -50490,7 +50490,7 @@
 /obj/machinery/newscaster/security_unit{
 	pixel_y = -30
 	},
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/brig)
 "ryJ" = (

diff --git a/_maps/map_files/layenia/layeniastation.dmm b/_maps/map_files/layenia/layeniastation.dmm
@@ -129708,7 +129708,7 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/alt,
 /obj/item/clothing/head/helmet/sec,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /turf/open/floor/plasteel/dark,
 /area/security/brig)
 "sRj" = (

diff --git a/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm b/_maps/splurt_maps/map_files/Smexistation/Snaxi_Splurt.dmm
@@ -54543,7 +54543,7 @@
 	pixel_y = 10
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/suit/armor/brigdoc/armor,
+/obj/item/clothing/suit/armor/brigdoc,
 /obj/item/clothing/head/helmet/brigdoc,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -446,7 +446,6 @@
 #define STATION_TRAIT_PDA_GLITCHED "station_trait_pda_glitched"
 
 #define SIGNAL_ADDTRAIT(trait_ref) "addtrait [trait_ref]"
-#define SIGNAL_REMOVETRAIT(trait_ref) "removetrait [trait_ref]"
 
 /*
 Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
@@ -560,8 +559,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_ANTICONVULSANT "anticonvulsant"
 /// The holder of this trait has antennae or whatever that hurt a ton when noogied
 #define TRAIT_ANTENNAE "antennae"
-/// Blowing kisses actually does damage to the victim
-#define TRAIT_KISS_OF_DEATH "kiss_of_death"
 /// Used to activate french kissing
 #define TRAIT_GARLIC_BREATH "kiss_of_garlic_death"
 /// Used on limbs in the process of turning a human into a plasmaman while in plasma lava
@@ -730,7 +727,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_BADTOUCH "bad_touch"
 #define TRAIT_EXTROVERT "extrovert"
 #define TRAIT_INTROVERT "introvert"
-#define TRAIT_ANXIOUS "anxious"
 #define TRAIT_INSANITY "insanity"
 
 ///Trait for dryable items
@@ -872,8 +868,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define HIPPOCRATIC_OATH_TRAIT "hippocratic_oath"
 /// Trait granted by [/datum/status_effect/blooddrunk]
 #define BLOODDRUNK_TRAIT "blooddrunk"
-/// Trait granted by lipstick
-#define LIPSTICK_TRAIT "lipstick_trait"
 /// Self-explainatory.
 #define BEAUTY_ELEMENT_TRAIT "beauty_element"
 #define MOOD_COMPONENT_TRAIT "mood_component"

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -126,7 +126,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MUSICIAN" = TRAIT_MUSICIAN,
 		"TRAIT_MASO" = TRAIT_MASO,
 		"TRAIT_HIGH_BLOOD" = TRAIT_HIGH_BLOOD,
-		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
 		"TRAIT_EMPATH" = TRAIT_EMPATH,
 		"TRAIT_KARTAVII" = TRAIT_KARTAVII,
 		"TRAIT_ASIAT" = TRAIT_ASIAT,

diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
@@ -1,7 +1,6 @@
 /obj/item/hand_item
 	item_flags = DROPDEL | ABSTRACT | HAND_ITEM
 
-
 /obj/item/hand_item/circlegame
 	name = "circled hand"
 	desc = "If somebody looks at this while it's below your waist, you get to bop them."

diff --git a/modular_bluemoon/sanecman/code/rabbit/outfit.dm b/modular_bluemoon/sanecman/code/rabbit/outfit.dm
@@ -4,6 +4,7 @@
 /obj/item/clothing/under/suit/lobotomy/rabbit
 	name = "\improper r-corp uniform"
 	desc = "A black uniform with a orange line worn by R-corps mercenaries."
+	armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 30, BOMB = 30, BIO = 30, RAD = 30, FIRE = 100, ACID = 100)
 	icon = 'modular_bluemoon/sanecman/icons/lcorp/obj/lcuniform.dmi'
 	mob_overlay_icon = 'modular_bluemoon/sanecman/icons/lcorp/mob/under.dmi'
 	mutantrace_variation = STYLE_DIGITIGRADE|USE_TAUR_CLIP_MASK|STYLE_NO_ANTHRO_ICON
@@ -18,6 +19,7 @@
 /obj/item/clothing/head/rabbit_helmet //No armor since the ego-gears do it's job.
 	name = "\improper rabbit team command helmet"
 	desc = "An Combat helmet worn by R-Corporation mercenaries in the field, this one look rather unique"
+	armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 30, BOMB = 30, BIO = 30, RAD = 30, FIRE = 100, ACID = 100)
 	icon_state = "rabbit"
 	icon = 'modular_bluemoon/sanecman/icons/lcorp/obj/head.dmi'
 	mob_overlay_icon = 'modular_bluemoon/sanecman/icons/lcorp/mob/head.dmi'
@@ -28,6 +30,7 @@
 /obj/item/clothing/head/rabbit_helmet/grunt
 	name = "\improper rabbit team helmet"
 	desc = "An Combat helmet worn by R-Corporation mercenaries in the field."
+	armor = list(MELEE = 40, BULLET = 30, LASER = 20,ENERGY = 30, BOMB = 30, BIO = 30, RAD = 30, FIRE = 100, ACID = 100)
 	icon_state = "rabbit"
 
 /obj/item/clothing/head/rabbit_helmet/grunt/Initialize(mapload)

diff --git a/modular_splurt/icons/mobs/suits.dmi b/modular_splurt/icons/mobs/suits.dmi
diff --git a/modular_splurt/icons/obj/clothing/suits.dmi b/modular_splurt/icons/obj/clothing/suits.dmi