From af82e1109fd9c1310775c2e0d6d5ae1823bcf41a Mon Sep 17 00:00:00 2001 From: Poojawa Date: Tue, 20 Mar 2018 10:41:36 -0500 Subject: [PATCH] slight tweaks, revert job controller changes, penor layering tweaked --- .../mob/living/carbon/human/species.dm | 22 ++---------------- .../code/controllers/subsystem/job.dm | 13 +++++++---- .../mob/living/carbon/human/species.dm | 18 +++++++++++++- .../icons/obj/genitals/penis_onmob.dmi | Bin 1335 -> 1341 bytes 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c60eafbad2..5c45ab9172 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -685,26 +685,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) S = GLOB.moth_wings_list[H.dna.features["moth_wings"]] if("caps") S = GLOB.caps_list[H.dna.features["caps"]] - - //Mammal Bodyparts - if("mam_tail") - S = GLOB.mam_tails_list[H.dna.features["mam_tail"]] - if("mam_waggingtail") - S.= GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]] - if("mam_body_markings") - S = GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]] - if("mam_ears") - S = GLOB.mam_ears_list[H.dna.features["mam_ears"]] - if("taur") - S = GLOB.taur_list[H.dna.features["taur"]] - - //Xeno Bodyparts - if("xenodorsal") - S = GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]] - if("xenohead") - S = GLOB.xeno_head_list[H.dna.features["xenohead"]] - if("xenotail") - S = GLOB.xeno_tail_list[H.dna.features["xenotail"]] + else + S = citadel_mutant_bodyparts(bodypart, H) if(!S || S.icon_state == "none") continue diff --git a/modular_citadel/code/controllers/subsystem/job.dm b/modular_citadel/code/controllers/subsystem/job.dm index e9d7c65a34..846c17344c 100644 --- a/modular_citadel/code/controllers/subsystem/job.dm +++ b/modular_citadel/code/controllers/subsystem/job.dm @@ -1,4 +1,4 @@ -/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M) +/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff) var/mob/the_mob = N if(!the_mob) the_mob = M // cause this doesn't get assigned if player is a latejoiner @@ -11,18 +11,21 @@ if(!G) continue var/permitted = TRUE + if(G.restricted_roles && G.restricted_roles.len && !(M.mind.assigned_role in G.restricted_roles)) + permitted = FALSE if(G.ckeywhitelist && G.ckeywhitelist.len && !(the_mob.client.ckey in G.ckeywhitelist)) permitted = FALSE - if(G.restricted_roles && G.restricted_roles.len && !(M.job in G.restricted_roles)) + if(!equipbackpackstuff && G.category == slot_in_backpack)//snowflake check since plopping stuff in the backpack doesnt work for pre-job equip loadout stuffs + permitted = FALSE + if(equipbackpackstuff && G.category != slot_in_backpack)//ditto permitted = FALSE if(!permitted) continue var/obj/item/I = new G.path - if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // Try to put it in its slot, first - if(!M.equip_to_slot_if_possible(I, slot_in_backpack, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If it fails, try to put it in the backpack + if(!M.equip_to_slot_if_possible(I, G.category, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first + if(!M.equip_to_slot_if_possible(I, slot_in_backpack, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // Otherwise, try to put it in the backpack I.forceMove(get_turf(M)) // If everything fails, just put it on the floor under the mob. - /datum/controller/subsystem/job/proc/FreeRole(rank) if(!rank) return diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species.dm b/modular_citadel/code/modules/mob/living/carbon/human/species.dm index 74b5404c09..d3ac99d61c 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/species.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/species.dm @@ -76,4 +76,20 @@ /datum/species/proc/citadel_mutant_bodyparts(bodypart, mob/living/carbon/human/H) switch(bodypart) if("ipc_screen") - return GLOB.ipc_screens_list[H.dna.features["ipc_screen"]] \ No newline at end of file + return GLOB.ipc_screens_list[H.dna.features["ipc_screen"]] + if("mam_tail") + return GLOB.mam_tails_list[H.dna.features["mam_tail"]] + if("mam_waggingtail") + return GLOB.mam_tails_animated_list[H.dna.features["mam_tail"]] + if("mam_body_markings") + return GLOB.mam_body_markings_list[H.dna.features["mam_body_markings"]] + if("mam_ears") + return GLOB.mam_ears_list[H.dna.features["mam_ears"]] + if("taur") + return GLOB.taur_list[H.dna.features["taur"]] + if("xenodorsal") + return GLOB.xeno_dorsal_list[H.dna.features["xenodorsal"]] + if("xenohead") + return GLOB.xeno_head_list[H.dna.features["xenohead"]] + if("xenotail") + return GLOB.xeno_tail_list[H.dna.features["xenotail"]] \ No newline at end of file diff --git a/modular_citadel/icons/obj/genitals/penis_onmob.dmi b/modular_citadel/icons/obj/genitals/penis_onmob.dmi index bdda4a94d53f42e2a76e47704517fd3554e9bde1..733e0a08da1619edbd1428cb354e5cee695f3c73 100644 GIT binary patch delta 963 zcmV;!13dh<3cU)ji2;9~Nkl!JX5C%{&#txR2fql0l@EU>(zzr}bP9R9tPGW2prq+>G4C5 zSRbG57{>p@eoGKI_#K{Je|o|0`qK+`*YBRlch?6100000T8*C9rY+B3)CUdm0QP)d z`)hT-Y(6<_ihTR{Ly-9W@wY@g-Y=Wa&5J|x2h_*bkF84(xU%u-^nzjF;QG@GhJl0Y zhq?#U>kgPX#z}p{F@i1_% z{=nB|`!B(MQU2g*V)=njFPPnLV_kwk^uWUnw)=&NvkixjPp7}b-O3N#KotN00000c zy777O&iMPi$KEf_4%hbo-F&|{J+EGuAP_X19$$Wr3ci0mA76&!(`dhqHOfZ~hZ}73 zQ3t2<@ny7qxZgG(Z8-WJ{wXZ@XDS{Bw%dn^V8itN-sX3By6)cy000000Dw!@J+GZ! ze_etN!az3P{9U%w3u<_B{pkg}8@~9jM-BtUd|CJSbX}svjWJ&a00000;IbS%uU(fQ zFn#pWJ?nqb@X_@(JhtG+D1Z8xiid%Xb(cT5;coi}bmI-bV0r$+{aye70000u)Qu0< zrWXwJ8XjAJdciQS;j#5!C^&mSy{&&^O)8S3i(Nc7+}fwB>t9R1^!nBt-Y=*&-2K2_FL!?p?+RvrMt1q~fm2T`42PfL zn{RkGUJZBHtk~sq8|>4mfo~l4_0RwS0001R$>QP0>*7(&*!9)(YIyc~4PRKj@f##N znEihd8o$BhhU>R+s~aQ-zU9yGwYj^7{RRL40002Mg**5%W%v5&1-sWzFW9|)dcp4X zFL?dBYq4PYx~_(E_0tR54?OzH{2exYKB6CfgFN|--}`v(0AU&c0001hUfq`|r?0=d z16S8y-GQs?ukOIr_0{XA#RJd2ZF`3eU)?)_s|UEdhO75&m*V>Jec$Q<000000N_Yp l|L#7)WZ!ik006i>{{UJlpSy!;iID&R002ovPDHLkV1nLO?d$*m delta 957 zcmV;u148`03bzWdi2;9^NklnuGY%0y5NqDk?+oy0+ZG^N>03z}&H00000PT|$=^?usCJUIV?4c|Hkmi6Y% z%flPaHu#1E000000KorN4BM8uZ$MG+_HOg?r;mN}*Y%Fp@a=!;-PBW2?`RG0o?nbp z_YTZ%xcvvBfk$gN`y&wh=K}x$0000xdj0YHj~+7r_0KOK730~x=e5(P`~2T`&Yz~` zY5w-07^nX5^h?*Yvfk&XKQ=D+&Y#i;)Ri0FJAcX_Uk=W{V8fMpZSTOM-uQ;MWe>=g zdHu|TGr;bQ)pe7<+@d38B|9Xq~k9iN8h#jSzUmp@~HYel^` zziwTQ-|%H#J#p~yY50Z@53JSOeud*VyeLpwpP6w^As{1OeU)q8V4+)E#y7CV24=CAAB?r(UJzkZ@s>nr>r z8d$4$`)m7hG_d)6Z}KZVT=pjd000000N~WFHZMNi>C zsOS5r?=AECnFnWp3;+NC0KloW&TE&sZ+=nFaIJIx@WAZ+;epxtt%2{Ofwg+K_nViO zXns-P;9q~w9KPYpy1>C34s*U20000000vs-)e{FFt_=_Dy@S^L;eow((3(Fyu=fsH z^M?oa-a%`A*zf^$t=`ebx7nWv00000008zh&*xtMTkHC-&#}Pl_00|c7|TmvfBV`R z_#6xTJGOj$!_#vtFt|M2aPwRGat&wy4o2^o^Sgfl00000aAfVXntScTt-kBms{LrV zcR)q&hO70i)^Ip4Tp)VK8p~a-;i-1LDq5iPz}Ng3000000EW7sjkHe}8`qbkn3qfH zgPPX$<%TZTaARP!;n6ot!;OKpiq$(7eM@iOv08iOGZ$#M@!#o|6)V@<3RIVG|3BdJ zV&{MP`te<^VV?j100000IJfM>n8W|Dp1olW?=5@7XKVOqr)_r+JYB=-8}5B%e)qhy zHJpC{Jh}k@000004ki0A<<9Ge2WGDy9+&p2PLN0Qs~Z3S0000W)8)SBvS>B<-+vNzF;LO)+l*ZdQRW f*Ra#LJdFPUl(nC`VAvSh00000NkvXXu0mjfuA%jT