From 6138e1e9b9358b90ce1e6eab48cacda2ca78c90d Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:28:26 -0700 Subject: [PATCH 01/38] creates moth marking list --- .gitignore | 2 ++ code/__HELPERS/mobs.dm | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..df7a79e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +tgstation.int diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 80c33f2f..e4fd3e37 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -72,6 +72,8 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, GLOB.wings_list) if(!GLOB.moth_wings_list.len) init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings, GLOB.moth_wings_list) + if(!GLOB.moth_markings_list.len) + init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, GLOB.moth_markings_list) //CIT CHANGES - genitals and such if(!GLOB.cock_shapes_list.len) @@ -145,6 +147,7 @@ "legs" = pick("Normal Legs","Digitigrade Legs"), "caps" = pick(GLOB.caps_list), "moth_wings" = pick(GLOB.moth_wings_list), + "moth_markings" = pick(GLOB.moth_markings), "taur" = "None", "mam_body_markings" = pick(snowflake_markings_list), "mam_ears" = pick(snowflake_ears_list), From f81b544cd169ffdbac425a3e64b8beb9c80dd8ec Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:29:43 -0700 Subject: [PATCH 02/38] Update flavor_misc.dm --- code/_globalvars/lists/flavor_misc.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 6700fbad..a9615d7c 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -35,6 +35,7 @@ GLOBAL_LIST_EMPTY(wings_list) GLOBAL_LIST_EMPTY(wings_open_list) GLOBAL_LIST_EMPTY(r_wings_list) GLOBAL_LIST_EMPTY(moth_wings_list) +GLOBAL_LIST_EMPTY(moth_markings_list) GLOBAL_LIST_EMPTY(caps_list) GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites From e29c688b2b7dde262690163908568da75be7a113 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:30:49 -0700 Subject: [PATCH 03/38] Update preferences.dm --- code/modules/client/preferences.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f0348a19..7e59042c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -104,6 +104,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain", + "moth_markings" = "None", "mcolor2" = "FFF", "mcolor3" = "FFF", "mam_body_markings" = "Plain", From b70f7ca37713842f07fd5f1465f401d24bb3389b Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:35:21 -0700 Subject: [PATCH 04/38] Update preferences.dm --- code/modules/client/preferences.dm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7e59042c..9b1da634 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -460,6 +460,20 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(mutant_category >= MAX_MUTANT_ROWS) dat += "" mutant_category = 0 + + if("moth_markings" in pref_species.default_features) + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += "
8zQv 5Sa#*pJ *)q~>jHUtCsKNiXv2sFbf5c4@U?tsGcPC6%UA
zuv47;J3*eh+*;quTI*Bo39{qvp1Um2wMW_S)w+}>Lzl2KDt5b=6apcJYdz;J2CLT6
zJJCOWuh(EK#0yz91hzr)JF!kh3{1t*&f_1W!Fq#dvpTi45|eff!xW>QD66QF+iyu;
zq5!zS7ma@Q%H?AY?1^rczfQ4lmnaZ?XCl?+ByyB1TB4jd1p)N5h4Xu){dI-KB}u~r
z-wXc~25$_WtM@^jD!v+~Ka`GHV1H(P`8~@@(_a*&IV9e$v>h!ngg)29(=#*Z=6IA0
zX*JzCXX%HlA$6boJ>U~&_6fV21aAQcKa;QB$NtU}7wg0E7pX4_>h -KyIp%iDz&l&JvfwaYlqx%(+o7w
zYJa*i*Xt$}uE@SW9n^v&lnWm`R&&Hep5!(Rz3Cg-OYZ59#e3jpV-NL84*@;a891D9
z`eVbkdT@{uo<^AKR$3SIgw>f{cVF#D*pSS>DyZ@v{qD4-_$h`{h1mr^%{tT)t;_|s
z!f#h6u?7bRQ>zDeq=u+p4_E*b(%C;9f5B{ QD&Pwu^@ZFc1RH~TEeoC*82|jJ^WXw^a5^wL=F=-{k4R~CO
zCQ-?{(80Nkq%zHiO5zC8SCoD?gSecp^@_z4iESt@cO4!J&g~v8ADBvYvE#(s1Q5$O
z;j+Ehrx|UZnX`x5#1R M;3Z!(Uj}PvHIW`J{B>KxUyG~Zrjq-FR?F0LsP2n`Mdv0-Ta8?)
z`g~>MGfhawz?5_hWR3uN)Xk+F7dffzf9BC?nD?O&EeZd%30Q4YK#+gg=g}$u0zzRL
AH~;_u
From 81d750b441e4acc9a57a8497e3c820b893c44d7f Mon Sep 17 00:00:00 2001
From: quotefox <49098813+quotefox@users.noreply.github.com>
Date: Thu, 26 Sep 2019 22:49:03 +0100
Subject: [PATCH 12/38] Enables emojis for PDA messages. (by Ghommie) ported
from Cit Code
---
code/game/machinery/telecomms/computers/message.dm | 1 +
.../machinery/telecomms/machines/message_server.dm | 7 ++++---
code/game/objects/items/devices/PDA/PDA.dm | 10 ++++++----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index b9b6e3af..a5293500 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -419,6 +419,7 @@
"name" = "[customsender]",
"job" = "[customjob]",
"message" = custommessage,
+ "emoji_message" = emoji_parse(custommessage),
"targets" = list("[customrecepient.owner] ([customrecepient.ownjob])")
))
// this will log the signal and transmit it to the target
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 19600808..0cf356ad 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -106,10 +106,11 @@
return "Everyone"
return data["targets"][1]
-/datum/signal/subspace/pda/proc/format_message()
+/datum/signal/subspace/pda/proc/format_message(emojify = FALSE)
+ var/message = emojify ? data["emoji_message"] : data["message"]
if (logged && data["photo"])
- return "\"[data["message"]]\" (Photo)"
- return "\"[data["message"]]\""
+ return "\"[message]\" (Photo)"
+ return "\"[message]\""
/datum/signal/subspace/pda/broadcast()
if (!logged) // Can only go through if a message server logs it
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 1533fdfc..505d2c07 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -714,6 +714,7 @@ GLOBAL_LIST_EMPTY(PDAs)
return
if((last_text && world.time < last_text + 10) || (everyone && last_everyone && world.time < last_everyone + PDA_SPAM_DELAY))
return
+ var/emoji_message = emoji_parse(message)
if(prob(1))
message += "\nSent from my PDA"
// Send the signal
@@ -734,7 +735,8 @@ GLOBAL_LIST_EMPTY(PDAs)
"name" = "[owner]",
"job" = "[ownjob]",
"message" = message,
- "targets" = string_targets
+ "targets" = string_targets,
+ "emoji_message" = emoji_message
))
if (picture)
signal.data["photo"] = picture
@@ -751,13 +753,13 @@ GLOBAL_LIST_EMPTY(PDAs)
// Log it in our logs
tnote += "→ To [target_text]:(+_2(_
z;Yd09Y~b?t{{6a8_8|h~=fAEP1itdpiD_x&MftN-kuntk&dcBV;3n%|&jl?vy;a{>
zbp^BbHQYBr2id;wlBe2_JFQbybTBf%V?=zgF#@Z67hwOVt+$Sf>ign`X{41#Qb1`C
z5E!~71O(|00j0aUzJ$_^Gy(#`(4B)wNDQ4rNq0#1bNH=it@mB)egBxc_uPH<-TSla
zo)|uLyH(AW+4Fk8_nN-jJE`lIAF(Na-1fwnD>+DW4SQfuK*
W^hv(Y$e9p~EVGHqb$Mi#_rgrJC{zIR|A;Y^~#@Tmuqi9>suj
z6_^oZVPj)sj8
4XT5;q``
literal 0
HcmV?d00001
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index be9e0547..535885b3 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -149,8 +149,8 @@
should_draw_citadel = TRUE
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
- mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings", "mam_snouts")
- default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None")
+ mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings","moth_markings", "mam_snouts")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain","moth_markings" = "None", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None")
attack_verb = "flutter" //wat?
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
From 6e17e81dbad838b14b494a04f1687acc56946b13 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Wed, 25 Sep 2019 20:57:28 -0700
Subject: [PATCH 06/38] Update iv_drip.dm
---
code/game/machinery/iv_drip.dm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index b217c14e..edc7685b 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -13,8 +13,8 @@
var/obj/item/reagent_containers/beaker = null
var/static/list/drip_containers = typecacheof(list(/obj/item/reagent_containers/blood,
/obj/item/reagent_containers/food,
- /obj/item/reagent_containers/glass))
-
+ /obj/item/reagent_containers/glass,
+ /obj/item/reagent_containers/chem_pack))
/obj/machinery/iv_drip/Initialize()
. = ..()
update_icon()
@@ -129,9 +129,7 @@
if(istype(beaker, /obj/item/reagent_containers/blood))
// speed up transfer on blood packs
transfer_amount = 10
- var/fraction = min(transfer_amount/beaker.reagents.total_volume, 1) //the fraction that is transfered of the total volume
- beaker.reagents.reaction(attached, INJECT, fraction, FALSE) //make reagents reacts, but don't spam messages
- beaker.reagents.trans_to(attached, transfer_amount)
+ beaker.reagents.trans_to(attached, transfer_amount, method = INJECT, show_message = FALSE)
update_icon()
// Take blood
From ff749a14aac62bac60824b02f8d270e72861d052 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Wed, 25 Sep 2019 21:04:37 -0700
Subject: [PATCH 07/38] adds iv bags to chem bag allowed
---
code/game/objects/items/storage/bags.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 4e719625..7ab85084 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -364,7 +364,7 @@
STR.max_combined_w_class = 200
STR.max_items = 50
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle))
+ STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/chem_pack))
/*
* Biowaste bag (mostly for xenobiologists)
From bdda040ede4e2eec6c91d3868fb4d4def039a4b8 Mon Sep 17 00:00:00 2001
From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com>
Date: Wed, 25 Sep 2019 21:50:54 -0700
Subject: [PATCH 08/38] Makes sprite work again for filling it by adding
missing sprites.
---
icons/obj/reagentfillings.dmi | Bin 3885 -> 4337 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 1b8dacf36daaffb08e40ef7351b9d349384bf59c..fa74d50e5198ca768d92575ed0847362ff366824 100644
GIT binary patch
literal 4337
zcmb_gXIPWjw*EqZ1c49+Bsc^T9Var15*&tJLK{V;s9+gM0w@S55Tr^CprD|Fm0r|Q
zni56?qz57ciWChPC6WM90tpC62_yvW=kd9}?wmR2p6C4de(e3N-QM-CwcoWbyE^Yt
z-thef005L7_u3x<00;s6uyA>>r{h%lEZBGy?RG58-Y4|rIe$u+e{c{0MCIRp>lD ^yTxH%Gto$#N)>bo}@XTb_JasHz#*qFTc;27@b&36z+fEZz`GMa1^C
z`O|_G8M6~A6onM}wSTnrznJ^&Po)#pQ&Gp!eCD8F>bs_J%xNSQHERmnBjs-PFp~W>
zW@rPJ3o3~gelZBGo4fJd{_%YgLqay(!qCe#^lN`9H^Y?vMC{Hs)L`qrtTyR&vBahG
zVznH$VM5CcogO$#YvWY{2Qh9i-LV8jns|*5)F2X>h8s;cQg$Z5ul%t#BIEje9jy*3
zGt`_~)WgQz5Rayfs`Vt=iJbKY5)CRaCUYlE=%iO|2g!lbvD$a!$nfPJqqKALzIu%h
z)~W>N7
[CONFIG_GET(string/servertagline)]
" //CIT CHANGE - adds a tagline!
diff --git a/icons/turf/walls/wall.dmi b/icons/turf/walls/wall.dmi
index f1183bceeed3b1c84b89ad98ccb6ea13e95bb217..6dfe1ecd6f56ff6c80b7e3f809f9621c3e1c7d9d 100644
GIT binary patch
delta 1138
zcmcb{eS&*K8e_e$r;B4q#hkZuUzgo75NP4
[signal.format_message()]
"
// Show it to ghosts
- var/ghost_message = "[owner] PDA Message --> [target_text]: "
+ var/ghost_message = "[owner] PDA Message --> [target_text]: "
for(var/mob/M in GLOB.player_list)
if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA))
to_chat(M, "[FOLLOW_LINK(M, user)] [ghost_message]")
// Log in the talk log
user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text]")
- to_chat(user, "Message sent to [target_text]: \"[message]\"")
+ to_chat(user, "Message sent to [target_text]: \"[emoji_message]\"")
if (!silent)
playsound(src, 'sound/machines/terminal_success.ogg', 15, 1)
// Reset the photo
@@ -787,7 +789,7 @@ GLOBAL_LIST_EMPTY(PDAs)
hrefstart = ""
hrefend = ""
- to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message()] (Reply)")
+ to_chat(L, "[icon2html(src)] Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], [signal.format_message(TRUE)] (Reply)")
update_icon(TRUE)
From 2cd58c3009d2e0f07e4ed313a4abe44c31c16667 Mon Sep 17 00:00:00 2001
From: quotefox <49098813+quotefox@users.noreply.github.com>
Date: Fri, 27 Sep 2019 11:22:04 +0100
Subject: [PATCH 13/38] updated graphics for syringe
---
icons/obj/syringe.dmi | Bin 4730 -> 4868 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index 80e681399a6af01fc3a28012975ff7bf1f44a03d..16203907763d27cf5fbf2ca8ae4327130cffbd6a 100644
GIT binary patch
delta 4640
zcmbU_c{G&&*AF8}QmO0=->lijPL`3SlwBJ8zLur2GnQvUq-Y9}J(PVJB>SF-?8X{H
zW9%X!+l+Vmo%j8n^Pb;d@B5t3J)irW=YH