$}ePoc-DRvp;+9
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
From 139024566fbaff21409e4223478abe3627ab0058 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 23 Apr 2019 03:15:46 -0400
Subject: [PATCH 05/47] Update shield.dm
---
code/modules/antagonists/blob/blob/blobs/shield.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/antagonists/blob/blob/blobs/shield.dm b/code/modules/antagonists/blob/blob/blobs/shield.dm
index a83f4294b2..d52c208c71 100644
--- a/code/modules/antagonists/blob/blob/blobs/shield.dm
+++ b/code/modules/antagonists/blob/blob/blobs/shield.dm
@@ -8,7 +8,7 @@
explosion_block = 3
point_return = 4
atmosblock = TRUE
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
/obj/structure/blob/shield/scannerreport()
if(atmosblock)
@@ -20,11 +20,12 @@
/obj/structure/blob/shield/update_icon()
..()
- if(obj_integrity <= 75)
+ if(obj_integrity <= 70)
icon_state = "blob_shield_damaged"
name = "weakened strong blob"
desc = "A wall of twitching tendrils."
atmosblock = FALSE
+ armor = list("melee" = 15, "bullet" = 15, "laser" = 5, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
else
icon_state = initial(icon_state)
name = initial(name)
From 776b0fad4bf636ef13909891ced5734a9e00fe04 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 23 Apr 2019 15:59:29 -0700
Subject: [PATCH 06/47] Update AI_modules.dm
---
code/game/objects/items/AI_modules.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index d818191055..57d3d6b6ff 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -362,7 +362,7 @@ AI MODULES
/obj/item/aiModule/core/full/asimov
name = "'Asimov' Core AI Module"
law_id = "asimov"
- var/subject = "human being"
+ var/subject = "person of a NT approved crew species" //CITADEL CHANGED FROM HUMANS!
/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob)
var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject)
From 5c54bacddb9179f23256fdf59462008851eb49d3 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 23 Apr 2019 16:02:47 -0700
Subject: [PATCH 07/47] Update AI_modules.dm
---
code/game/objects/items/AI_modules.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index 57d3d6b6ff..a8d0bed2aa 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -362,7 +362,7 @@ AI MODULES
/obj/item/aiModule/core/full/asimov
name = "'Asimov' Core AI Module"
law_id = "asimov"
- var/subject = "person of a NT approved crew species" //CITADEL CHANGED FROM HUMANS!
+ var/subject = "person of an NT approved crew species" //CITADEL CHANGED FROM HUMANS!
/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob)
var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject)
From a5e750e20fec6c3a67a05bda6ac029299c30b761 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 23 Apr 2019 19:06:00 -0700
Subject: [PATCH 08/47] skintone
---
code/__DEFINES/citadel_defines.dm | 1 +
code/modules/mob/living/carbon/human/species.dm | 2 ++
.../code/modules/mob/dead/new_player/sprite_accessories.dm | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index ef14dbcaa3..b150067717 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -95,6 +95,7 @@
#define NOAROUSAL 37 //Stops all arousal effects
#define NOGENITALS 38 //Cannot create, use, or otherwise have genitals
#define MATRIXED 39 //if icon is color matrix'd
+#define SKINTONE 40 //uses skin tones
//Citadel istypes
#define isborer(A) (istype(A, /mob/living/simple_animal/borer))
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index ba1ad9e0da..e2e9e5149f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -755,6 +755,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(!(H.has_trait(TRAIT_HUSK)))
if(!forced_colour)
switch(S.color_src)
+ if(SKINTONE)
+ accessory_overlay.color = skintone2hex(H.skin_tone)
if(MUTCOLORS)
if(fixed_mut_color)
accessory_overlay.color = "#[fixed_mut_color]"
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
index 739f787d44..b6cfce0b24 100644
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -201,7 +201,7 @@
name = "Elf"
icon_state = "elf"
icon = 'modular_citadel/icons/mob/mam_ears.dmi'
- color_src = MATRIXED
+ color_src = SKINTONE
/datum/sprite_accessory/ears/fennec
name = "Fennec"
From cb79f62ff9d27bb31a3e4e80eee7f38cd08847fb Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 25 Apr 2019 01:06:28 -0700
Subject: [PATCH 09/47] Update SDQL_2_wrappers.dm
---
code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 3056b459d8..97a799824b 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -217,3 +217,7 @@
/proc/_step_away(ref, trg, max)
step_away(ref, trg, max)
+/proc/_instantiate_at(thing, location)
+ new thing(location)
+
+
From 766a1196960467bed5411b0670d843f69233343a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 25 Apr 2019 04:14:35 -0700
Subject: [PATCH 10/47] Update vent_clog.dm
---
code/modules/events/vent_clog.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 75833fc086..72fef4335d 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -73,7 +73,7 @@
var/obj/machinery/atmospherics/components/unary/vent = pick(vents)
vents -= vent
- if(!vent)
+ if(!vent || vent.welded)
return
var/turf/T = get_turf(vent)
@@ -150,7 +150,7 @@
/datum/round_event/vent_clog/beer/start()
for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc)
+ if(vent && vent.loc && !vent.welded)
var/datum/reagents/R = new/datum/reagents(1000)
R.my_atom = vent
R.add_reagent("beer", reagentsAmount)
@@ -165,7 +165,7 @@
/datum/round_event/vent_clog/male/start()
for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc)
+ if(vent && vent.loc && !vent.welded)
var/datum/reagents/R = new/datum/reagents(1000)
R.my_atom = vent
R.add_reagent("semen", reagentsAmount)
@@ -180,7 +180,7 @@
/datum/round_event/vent_clog/female/start()
for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc)
+ if(vent && vent.loc && !vent.welded)
var/datum/reagents/R = new/datum/reagents(1000)
R.my_atom = vent
R.add_reagent("femcum", reagentsAmount)
@@ -195,7 +195,7 @@
/datum/round_event/vent_clog/plasma_decon/start()
for(var/obj/machinery/atmospherics/components/unary/vent in vents)
- if(vent && vent.loc)
+ if(vent && vent.loc && !vent.welded)
var/datum/effect_system/smoke_spread/freezing/decon/smoke = new
smoke.set_up(7, get_turf(vent), 7)
smoke.start()
From da11e400b9490e2610edf8e9b74d268a998ac4a0 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Fri, 26 Apr 2019 03:18:45 -0700
Subject: [PATCH 11/47] Update all_nodes.dm
---
code/modules/research/techweb/all_nodes.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index c2abc2f2c5..2a0a23cc0d 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -428,7 +428,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
export_price = 5000
design_ids = list("s-receiver", "s-bus", "s-broadcaster", "s-processor", "s-hub", "s-server", "s-relay", "comm_monitor", "comm_server",
- "s-ansible", "s-filter", "s-amplifier", "ntnet_relay", "s-treatment", "s-analyzer", "s-crystal", "s-transmitter")
+ "s-ansible", "s-filter", "s-amplifier", "ntnet_relay", "s-treatment", "s-analyzer", "s-crystal", "s-transmitter", "message_monitor")
/datum/techweb_node/integrated_HUDs
id = "integrated_HUDs"
From e9ce7388792bbd835694584190d06e2ee80922c3 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 28 Apr 2019 03:44:01 -0700
Subject: [PATCH 12/47] Update toxin_reagents.dm
---
code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 26edcb5b73..7286f01623 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -759,6 +759,7 @@
taste_description = "skewing"
/datum/reagent/toxin/skewium/on_mob_life(mob/living/carbon/M)
+ /*
if(M.hud_used)
if(current_cycle >= 5 && current_cycle % 3 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
@@ -774,6 +775,7 @@
for(var/whole_screen in screens)
animate(whole_screen, transform = newmatrix, time = 5, easing = QUAD_EASING, loop = -1)
animate(transform = -newmatrix, time = 5, easing = QUAD_EASING)
+ */
return ..()
/datum/reagent/toxin/skewium/on_mob_delete(mob/living/M)
From 29af85a0ae7804c731428e880121d34339dd644f Mon Sep 17 00:00:00 2001
From: Poojawa
Date: Mon, 29 Apr 2019 02:37:01 -0500
Subject: [PATCH 13/47] Brings NTPR to the nice discord bot
---
code/__HELPERS/roundend.dm | 4 ++++
code/controllers/subsystem/ticker.dm | 3 +++
2 files changed, 7 insertions(+)
diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 165cea9557..cdd2e99dd8 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -199,6 +199,10 @@
if(length(CONFIG_GET(keyed_list/cross_server)))
send_news_report()
+ //tell the nice people on discord what went on before the salt cannon happens.
+ world.TgsTargetedChatBroadcast("The current round has ended. Please standby for your shift interlude Nanotrasen News Network's report!", FALSE)
+ world.TgsTargetedChatBroadcast(send_news_report(),FALSE)
+
CHECK_TICK
//These need update to actually reflect the real antagonists
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 9a4cad3667..13fb1fc224 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -564,6 +564,9 @@ SUBSYSTEM_DEF(ticker)
if(news_message)
send2otherserver(news_source, news_message,"News_Report")
+ return news_message
+ else
+ return "We reget to inform you that shit be whack, yo. And none of our reporters have any idea of what may or may not have gone on."
/datum/controller/subsystem/ticker/proc/GetTimeLeft()
if(isnull(SSticker.timeLeft))
From 55c85175e731d9311aad81d29b6fb44f3c4642a7 Mon Sep 17 00:00:00 2001
From: Poojawa
Date: Mon, 29 Apr 2019 02:41:15 -0500
Subject: [PATCH 14/47] I can english to potatoe
---
code/controllers/subsystem/ticker.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 13fb1fc224..4a3143da79 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -566,7 +566,7 @@ SUBSYSTEM_DEF(ticker)
send2otherserver(news_source, news_message,"News_Report")
return news_message
else
- return "We reget to inform you that shit be whack, yo. And none of our reporters have any idea of what may or may not have gone on."
+ return "We regret to inform you that shit be whack, yo. None of our reporters have any idea of what may or may not have gone on."
/datum/controller/subsystem/ticker/proc/GetTimeLeft()
if(isnull(SSticker.timeLeft))
From 3fd4e9ac22bd02dd36e3f6b590d8bc1e884b2b16 Mon Sep 17 00:00:00 2001
From: Poojawa
Date: Mon, 29 Apr 2019 04:31:33 -0500
Subject: [PATCH 15/47] Fixes medical helmet muzzle leak
tbh I though it'd look nice through the glass but HAHA FUCK BYOND
---
code/modules/clothing/spacesuits/hardsuit.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 02982998e1..c061d756b7 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -443,7 +443,6 @@
icon_state = "hardsuit0-medical"
item_state = "medical_helm"
item_color = "medical"
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
flash_protect = 0
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
scan_reagents = 1
From 72751a9efce09fc65f1ba1a372b83c4bf93751ba Mon Sep 17 00:00:00 2001
From: Poojawa
Date: Mon, 29 Apr 2019 04:33:23 -0500
Subject: [PATCH 16/47] Sorts and cleans up some sprites
adds guilmon things to lizards as well, since they didn't have it I guess
---
code/modules/client/preferences.dm | 79 ++++++++++++++--
code/modules/surgery/bodyparts/bodyparts.dm | 6 +-
.../code/modules/client/preferences.dm | 72 +--------------
.../mob/dead/new_player/sprite_accessories.dm | 85 +++++++++++-------
.../carbon/human/species_types/jellypeople.dm | 2 +-
modular_citadel/icons/mob/mam_markings.dmi | Bin 109546 -> 82727 bytes
modular_citadel/icons/mob/mam_tails.dmi | Bin 55135 -> 58203 bytes
.../icons/mob/markings_notmammals.dmi | Bin 22792 -> 34018 bytes
8 files changed, 129 insertions(+), 115 deletions(-)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 24768279b8..067f32023d 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -75,10 +75,76 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/eye_color = "000" //Eye color
var/datum/species/pref_species = new /datum/species/human() //Mutant race
var/list/features = list("mcolor" = "FFF",
- "tail_lizard" = "Smooth", "tail_human" = "Cat",
- "snout" = "Round", "horns" = "None", "ears" = "Cat",
- "wings" = "None", "frills" = "None", "spines" = "None",
- "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain")
+ "tail_lizard" = "Smooth",
+ "tail_human" = "None",
+ "snout" = "Round",
+ "horns" = "None",
+ "ears" = "None",
+ "wings" = "None",
+ "frills" = "None",
+ "spines" = "None",
+ "body_markings" = "None",
+ "legs" = "Normal Legs",
+ "moth_wings" = "Plain",
+ "mcolor2" = "FFF",
+ "mcolor3" = "FFF",
+ "mam_body_markings" = "Plain",
+ "mam_ears" = "None",
+ "mam_snouts" = "None",
+ "mam_tail" = "None",
+ "mam_tail_animated" = "None",
+ "xenodorsal" = "Standard",
+ "xenohead" = "Standard",
+ "xenotail" = "Xenomorph Tail",
+ "taur" = "None",
+ "exhibitionist" = FALSE,
+ "genitals_use_skintone" = FALSE,
+ "has_cock" = FALSE,
+ "cock_shape" = "Human",
+ "cock_length" = 6,
+ "cock_girth_ratio" = COCK_GIRTH_RATIO_DEF,
+ "cock_color" = "fff",
+ "has_sheath" = FALSE,
+ "sheath_color" = "fff",
+ "has_balls" = FALSE,
+ "balls_internal" = FALSE,
+ "balls_color" = "fff",
+ "balls_amount" = 2,
+ "balls_sack_size" = BALLS_SACK_SIZE_DEF,
+ "balls_size" = BALLS_SIZE_DEF,
+ "balls_cum_rate" = CUM_RATE,
+ "balls_cum_mult" = CUM_RATE_MULT,
+ "balls_efficiency" = CUM_EFFICIENCY,
+ "balls_fluid" = "semen",
+ "has_ovi" = FALSE,
+ "ovi_shape" = "knotted",
+ "ovi_length" = 6,
+ "ovi_color" = "fff",
+ "has_eggsack" = FALSE,
+ "eggsack_internal" = TRUE,
+ "eggsack_color" = "fff",
+ "eggsack_size" = BALLS_SACK_SIZE_DEF,
+ "eggsack_egg_color" = "fff",
+ "eggsack_egg_size" = EGG_GIRTH_DEF,
+ "has_breasts" = FALSE,
+ "breasts_color" = "fff",
+ "breasts_size" = "C",
+ "breasts_shape" = "Pair",
+ "breasts_fluid" = "milk",
+ "has_vag" = FALSE,
+ "vag_shape" = "Human",
+ "vag_color" = "fff",
+ "vag_clits" = 1,
+ "vag_clit_diam" = 0.25,
+ "has_womb" = FALSE,
+ "womb_cum_rate" = CUM_RATE,
+ "womb_cum_mult" = CUM_RATE_MULT,
+ "womb_efficiency" = CUM_EFFICIENCY,
+ "womb_fluid" = "femcum",
+ "ipc_screen" = "Sunburst",
+ "ipc_antenna" = "None",
+ "flavor_text" = ""
+ )
var/list/custom_names = list()
var/prefered_security_department = SEC_DEPT_RANDOM
@@ -1463,8 +1529,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["body_markings"] = "None"
if(!("mam_body_markings" in pref_species.default_features))
features["mam_body_markings"] = "None"
- if("mam_body_markings" in pref_species.default_features && features["mam_body_markings"] == "None")
- features["mam_body_markings"] = "Plain"
+ if("mam_body_markings" in pref_species.default_features)
+ if(features["mam_body_markings"] == "None")
+ features["mam_body_markings"] = "Plain"
if("tail_lizard" in pref_species.default_features)
features["tail_lizard"] = "Smooth"
if(pref_species.id == "felinid")
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index f394351285..152ce3bc46 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -442,9 +442,9 @@
// Body markings
if(body_markings)
if(species_id == "husk")
- marking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir)
+ marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir)
else if(species_id == "husk" && use_digitigrade)
- marking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+ marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
else if(!use_digitigrade)
marking = image('modular_citadel/icons/mob/mam_markings.dmi', "[body_markings]_[body_zone]", -MARKING_LAYER, image_dir)
@@ -459,7 +459,7 @@
. += aux
if(body_markings)
if(species_id == "husk")
- auxmarking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
+ auxmarking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
else
auxmarking = image('modular_citadel/icons/mob/mam_markings.dmi', "[body_markings]_[aux_zone]", -aux_layer, image_dir)
. += auxmarking
diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm
index 358208c1d7..dfe419964e 100644
--- a/modular_citadel/code/modules/client/preferences.dm
+++ b/modular_citadel/code/modules/client/preferences.dm
@@ -24,77 +24,7 @@
// stuff that was in base
max_save_slots = 10
- features = list("mcolor" = "FFF",
- "tail_lizard" = "Smooth",
- "tail_human" = "None",
- "snout" = "Round",
- "horns" = "None",
- "ears" = "None",
- "wings" = "None",
- "frills" = "None",
- "spines" = "None",
- "body_markings" = "None",
- "legs" = "Normal Legs",
- "moth_wings" = "Plain",
- "mcolor2" = "FFF",
- "mcolor3" = "FFF",
- "mam_body_markings" = "None",
- "mam_ears" = "None",
- "mam_snouts" = "None",
- "mam_tail" = "None",
- "mam_tail_animated" = "None",
- "xenodorsal" = "Standard",
- "xenohead" = "Standard",
- "xenotail" = "Xenomorph Tail",
- "taur" = "None",
- "exhibitionist" = FALSE,
- "genitals_use_skintone" = FALSE,
- "has_cock" = FALSE,
- "cock_shape" = "Human",
- "cock_length" = 6,
- "cock_girth_ratio" = COCK_GIRTH_RATIO_DEF,
- "cock_color" = "fff",
- "has_sheath" = FALSE,
- "sheath_color" = "fff",
- "has_balls" = FALSE,
- "balls_internal" = FALSE,
- "balls_color" = "fff",
- "balls_amount" = 2,
- "balls_sack_size" = BALLS_SACK_SIZE_DEF,
- "balls_size" = BALLS_SIZE_DEF,
- "balls_cum_rate" = CUM_RATE,
- "balls_cum_mult" = CUM_RATE_MULT,
- "balls_efficiency" = CUM_EFFICIENCY,
- "balls_fluid" = "semen",
- "has_ovi" = FALSE,
- "ovi_shape" = "knotted",
- "ovi_length" = 6,
- "ovi_color" = "fff",
- "has_eggsack" = FALSE,
- "eggsack_internal" = TRUE,
- "eggsack_color" = "fff",
- "eggsack_size" = BALLS_SACK_SIZE_DEF,
- "eggsack_egg_color" = "fff",
- "eggsack_egg_size" = EGG_GIRTH_DEF,
- "has_breasts" = FALSE,
- "breasts_color" = "fff",
- "breasts_size" = "C",
- "breasts_shape" = "Pair",
- "breasts_fluid" = "milk",
- "has_vag" = FALSE,
- "vag_shape" = "Human",
- "vag_color" = "fff",
- "vag_clits" = 1,
- "vag_clit_diam" = 0.25,
- "has_womb" = FALSE,
- "womb_cum_rate" = CUM_RATE,
- "womb_cum_mult" = CUM_RATE_MULT,
- "womb_efficiency" = CUM_EFFICIENCY,
- "womb_fluid" = "femcum",
- "ipc_screen" = "Sunburst",
- "ipc_antenna" = "None",
- "flavor_text" = ""
- )
+
/datum/preferences/New(client/C)
..()
diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
index 1a82040dbc..8e95fc3bfb 100644
--- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -36,6 +36,24 @@
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+/datum/sprite_accessory/body_markings/guilmon
+ name = "Guilmon"
+ icon_state = "guilmon"
+ color_src = MATRIXED
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
+
+/datum/sprite_accessory/tails/lizard/guilmon
+ name = "Guilmon"
+ icon_state = "guilmon"
+ color_src = MATRIXED
+ icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
+/datum/sprite_accessory/tails_animated/lizard/guilmon
+ name = "Guilmon"
+ icon_state = "guilmon"
+ color_src = MATRIXED
+ icon = 'modular_citadel/icons/mob/mam_tails.dmi'
+
//christ this was a mistake, but it's here just in case someone wants to selectively fix
/************* Lizard compatable snoots ***********
/datum/sprite_accessory/snouts/bird
@@ -291,7 +309,7 @@
icon_state = "wah"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/axolotl
name = "Axolotl"
icon_state = "axolotl"
@@ -315,7 +333,7 @@
icon_state = "bee"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/cat
name = "Cat"
icon_state = "cat"
@@ -327,7 +345,7 @@
icon_state = "cat"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = HAIR
-
+
/datum/sprite_accessory/tails/human/catbig
name = "Cat, Big"
icon_state = "catbig"
@@ -339,7 +357,7 @@
icon_state = "catbig"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/cow
name = "Cow"
icon_state = "cow"
@@ -359,7 +377,7 @@
/datum/sprite_accessory/tails_animated/human/corvid
name = "Corvid"
icon_state = "crow"
-
+
/datum/sprite_accessory/tails/human/eevee
name = "Eevee"
icon_state = "eevee"
@@ -371,7 +389,7 @@
icon_state = "eevee"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/fennec
name = "Fennec"
icon_state = "fennec"
@@ -383,7 +401,7 @@
icon_state = "fennec"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/fish
name = "Fish"
icon_state = "fish"
@@ -395,7 +413,7 @@
icon_state = "fish"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/fox
name = "Fox"
icon_state = "fox"
@@ -443,7 +461,7 @@
icon_state = "insect"
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
color_src = MATRIXED
-
+
/datum/sprite_accessory/tails/human/kitsune
name = "Kitsune"
icon_state = "kitsune"
@@ -455,7 +473,7 @@
icon_state = "kitsune"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/murid
name = "Murid"
icon_state = "murid"
@@ -467,7 +485,7 @@
icon_state = "murid"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/otie
name = "Otusian"
icon_state = "otie"
@@ -491,7 +509,7 @@
icon_state = "orca"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/pede
name = "Scolipede"
icon_state = "pede"
@@ -503,7 +521,7 @@
icon_state = "pede"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/rabbit
name = "Rabbit"
icon_state = "rabbit"
@@ -515,7 +533,7 @@
icon_state = "rabbit"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/sergal
name = "Sergal"
icon_state = "sergal"
@@ -527,7 +545,7 @@
icon_state = "sergal"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/skunk
name = "skunk"
icon_state = "skunk"
@@ -571,7 +589,7 @@
/datum/sprite_accessory/tails_animated/human/straighttail
name = "Straight Tail"
icon_state = "straighttail"
-
+
/datum/sprite_accessory/tails/human/squirrel
name = "Squirrel"
icon_state = "squirrel"
@@ -595,7 +613,7 @@
icon_state = "tentacle"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/tiger
name = "Tiger"
icon_state = "tiger"
@@ -607,7 +625,7 @@
icon_state = "tiger"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/datum/sprite_accessory/tails/human/wolf
name = "Wolf"
icon_state = "wolf"
@@ -619,7 +637,7 @@
icon_state = "wolf"
color_src = MATRIXED
icon = 'modular_citadel/icons/mob/mam_tails.dmi'
-
+
/******************************************
*********** Mammal Body Parts *************
*******************************************/
@@ -1281,26 +1299,31 @@ datum/sprite_accessory/mam_tails/insect
name = "None"
icon_state = "none"
ckeys_allowed = list("yousshouldnteverbeseeingthisyoumeme")
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/plain
name = "Plain"
icon_state = "plain"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
-/datum/sprite_accessory/mam_body_markings/ailurus
+/datum/sprite_accessory/mam_body_markings/redpanda
name = "Redpanda"
- icon_state = "wah"
+ icon_state = "redpanda"
/datum/sprite_accessory/mam_body_markings/bee
name = "Bee"
icon_state = "bee"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/belly
name = "Belly"
icon_state = "belly"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/bellyslim
name = "Bellyslim"
icon_state = "bellyslim"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/corgi
name = "Corgi"
@@ -1345,6 +1368,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/frog
name = "Frog"
icon_state = "frog"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/goat
name = "Goat"
@@ -1353,6 +1377,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/handsfeet
name = "Handsfeet"
icon_state = "handsfeet"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/hawk
name = "Hawk"
@@ -1373,6 +1398,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/moth
name = "Moth"
icon_state = "moth"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/otie
name = "Otie"
@@ -1401,6 +1427,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/pede
name = "Scolipede"
icon_state = "scolipede"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/shark
name = "Shark"
@@ -1429,6 +1456,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/turian
name = "Turian"
icon_state = "turian"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/datum/sprite_accessory/mam_body_markings/wolf
name = "Wolf"
@@ -1437,6 +1465,7 @@ datum/sprite_accessory/mam_tails/insect
/datum/sprite_accessory/mam_body_markings/xeno
name = "Xeno"
icon_state = "xeno"
+ icon = 'modular_citadel/icons/mob/markings_notmammals.dmi'
/******************************************
@@ -1746,19 +1775,6 @@ datum/sprite_accessory/mam_tails/insect
// *** Snooooow flaaaaake ***
-/datum/sprite_accessory/body_markings/guilmon
- name = "Guilmon"
- icon_state = "guilmon"
- color_src = MATRIXED
-
-/datum/sprite_accessory/tails/lizard/guilmon
- name = "Guilmon"
- icon_state = "guilmon"
-
-/datum/sprite_accessory/tails_animated/lizard/guilmon
- name = "Guilmon"
- icon_state = "guilmon"
-
/datum/sprite_accessory/horns/guilmon
name = "Guilmon"
icon_state = "guilmon"
@@ -1788,6 +1804,7 @@ datum/sprite_accessory/mam_tails/insect
name = "sabresune"
icon_state = "sabresune"
ckeys_allowed = list("poojawa")
+ extra = TRUE
/datum/sprite_accessory/mam_tails/sabresune
name = "sabresune"
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 64898f0121..b4eec5786a 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -14,7 +14,7 @@
default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
say_mod = "says"
hair_color = "mutcolor"
- hair_alpha = 180
+ hair_alpha = 160 //a notch brighter so it blends better.
liked_food = MEAT
coldmod = 3
heatmod = 1
diff --git a/modular_citadel/icons/mob/mam_markings.dmi b/modular_citadel/icons/mob/mam_markings.dmi
index c391674190e31b491f51c3d4e4ff46d64ef0ea4b..ceecf12d2ef88e28456686cf31d69f97a2310a6c 100644
GIT binary patch
literal 82727
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