From 7f356a83a284bc7ec1c75d95d923e47ab77d8708 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:23:53 +1100 Subject: [PATCH 001/133] Removing extraneous doors. --- maps/shaded_hills/shaded_hills-dungeon.dmm | 2 -- 1 file changed, 2 deletions(-) diff --git a/maps/shaded_hills/shaded_hills-dungeon.dmm b/maps/shaded_hills/shaded_hills-dungeon.dmm index dc6ee7b450ed..6d1ab918e6f6 100644 --- a/maps/shaded_hills/shaded_hills-dungeon.dmm +++ b/maps/shaded_hills/shaded_hills-dungeon.dmm @@ -466,8 +466,6 @@ /area/shaded_hills/caves/dungeon/poi) "GA" = ( /obj/structure/door/ebony, -/obj/structure/door/ebony, -/obj/structure/door/ebony, /obj/abstract/landmark/lock_preset{ lock_preset_id = "sunken keep"; name = "sunken keep locked door" From 9b9d395a743fd5b9c94dc770352851a9ab155a54 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:09 +1100 Subject: [PATCH 002/133] Allowing outside status of turfs to be seen in the mapper. --- code/game/turfs/turf.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 11c0740d79a1..87ca2918d54d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -54,8 +54,8 @@ // get overridden almost immediately. // TL;DR: just leave these vars alone. + var/is_outside = OUTSIDE_AREA // non-tmp to allow visibility in mapper. var/tmp/obj/abstract/weather_system/weather - var/tmp/is_outside = OUTSIDE_AREA var/tmp/last_outside_check = OUTSIDE_UNCERTAIN ///The cached air mixture of a turf. Never directly access, use `return_air()`. From b57c10bf70e2e0f761b2913e1004f94dbc5aaf02 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:22 +1100 Subject: [PATCH 003/133] Adding a basalt floor with sand turf type. --- code/game/turfs/floors/subtypes/floor_natural.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/turfs/floors/subtypes/floor_natural.dm b/code/game/turfs/floors/subtypes/floor_natural.dm index 09fbbcc07d27..5851afd8ab9c 100644 --- a/code/game/turfs/floors/subtypes/floor_natural.dm +++ b/code/game/turfs/floors/subtypes/floor_natural.dm @@ -100,6 +100,13 @@ color = "#ae9e66" _flooring = /decl/flooring/sand +/turf/floor/rock/basalt/sand + name = "sand" + icon = 'icons/turf/flooring/sand.dmi' + icon_state = "sand0" + color = "#ae9e66" + _flooring = /decl/flooring/sand + /turf/floor/rock/sand/water color = COLOR_SKY_BLUE fill_reagent_type = /decl/material/liquid/water From f6c87098d450bd664ac9ebb30f77f8f3c0df0d6a Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 19:24:33 +1100 Subject: [PATCH 004/133] Allowing downstreams to override skipped food types in CI test. --- code/unit_tests/icon_tests.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/unit_tests/icon_tests.dm b/code/unit_tests/icon_tests.dm index 8ab79c314a2b..279daba8a344 100644 --- a/code/unit_tests/icon_tests.dm +++ b/code/unit_tests/icon_tests.dm @@ -12,11 +12,14 @@ // We skip lumps because they are invisible, they are only ever inside utensils. var/list/skip_types = list(/obj/item/food/lump) -/datum/unit_test/icon_test/food_shall_have_icon_states/start_test() - +/datum/unit_test/icon_test/food_shall_have_icon_states/proc/assemble_skipped_types() skip_types |= typesof(/obj/item/food/grown) skip_types |= typesof(/obj/item/food/processed_grown) +/datum/unit_test/icon_test/food_shall_have_icon_states/start_test() + + assemble_skipped_types() + var/list/failures = list() for(var/check_type in check_types) for(var/check_subtype in typesof(check_type)) From 459ff16d9eb4c30986aa30693e2080b54895d45b Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:17:44 +1100 Subject: [PATCH 005/133] Allowed refitting to skip renaming the suit. --- code/game/machinery/suit_cycler.dm | 3 --- code/game/objects/items/devices/modkit.dm | 2 +- code/modules/clothing/_clothing.dm | 5 ++++- code/modules/clothing/spacesuits/void/void.dm | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm index 7f899870a1cb..f1721eeec371 100644 --- a/code/game/machinery/suit_cycler.dm +++ b/code/game/machinery/suit_cycler.dm @@ -492,11 +492,8 @@ if(helmet) target_modification.RefitItem(helmet) helmet.refit_for_bodytype(target_bodytype) - helmet.SetName("refitted [helmet.name]") if(suit) target_modification.RefitItem(suit) suit.refit_for_bodytype(target_bodytype) - suit.SetName("refitted [suit.name]") if(boots) boots.refit_for_bodytype(target_bodytype) - boots.SetName("refitted [initial(boots.name)]") diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index d3d7035496c2..1bdc6b37d749 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -52,7 +52,7 @@ user.visible_message("\The [user] opens \the [src] and modifies \the [O].","You open \the [src] and modify \the [O].") - I.refit_for_bodytype(target_bodytype) + I.refit_for_bodytype(target_bodytype, skip_rename = TRUE) if (istype(I, /obj/item/clothing/head/helmet)) parts &= ~MODKIT_HELMET diff --git a/code/modules/clothing/_clothing.dm b/code/modules/clothing/_clothing.dm index b6cc37b0adae..032f327ee0fa 100644 --- a/code/modules/clothing/_clothing.dm +++ b/code/modules/clothing/_clothing.dm @@ -285,7 +285,7 @@ update_wearer_vision() return ..() -/obj/item/clothing/proc/refit_for_bodytype(var/target_bodytype) +/obj/item/clothing/proc/refit_for_bodytype(target_bodytype, skip_rename = FALSE) bodytype_equip_flags = 0 decls_repository.get_decls_of_subtype(/decl/bodytype) // Make sure they're prefetched so the below list is populated @@ -297,6 +297,9 @@ if(species_icon && (check_state_in_icon(ICON_STATE_INV, species_icon) || check_state_in_icon(ICON_STATE_WORLD, species_icon))) icon = species_icon + if(!skip_rename) + SetName("refitted [initial(name)]") + if(last_icon != icon) reconsider_single_icon() update_clothing_icon() diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 7f2d8ecfe174..d0836d07b4cb 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -93,12 +93,12 @@ else if(##equipment_var) {\ if(tank && distance <= 1) to_chat(user, "The wrist-mounted pressure gauge reads [max(round(tank.air_contents.return_pressure()),0)] kPa remaining in \the [tank].") -/obj/item/clothing/suit/space/void/refit_for_bodytype(var/target_bodytype) +/obj/item/clothing/suit/space/void/refit_for_bodytype(target_bodytype, skip_rename = FALSE) ..() if(istype(helmet)) - helmet.refit_for_bodytype(target_bodytype) + helmet.refit_for_bodytype(target_bodytype, skip_rename) if(istype(boots)) - boots.refit_for_bodytype(target_bodytype) + boots.refit_for_bodytype(target_bodytype, skip_rename) /obj/item/clothing/suit/space/void/equipped(mob/M) ..() From 8c947097dabd44d8db32c88afc5b6f508a5bf907 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:21:37 +1100 Subject: [PATCH 006/133] Pilot voidsuit -> expedition voidsuit. --- code/modules/clothing/spacesuits/void/station.dm | 12 ++++++------ .../spacesuit/void/{pilot => expedition}/helmet.dmi | Bin .../spacesuit/void/{pilot => expedition}/suit.dmi | Bin 3 files changed, 6 insertions(+), 6 deletions(-) rename icons/clothing/spacesuit/void/{pilot => expedition}/helmet.dmi (100%) rename icons/clothing/spacesuit/void/{pilot => expedition}/suit.dmi (100%) diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index f420dc44078a..92b2b6b27cff 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -388,9 +388,9 @@ //Pilot /obj/item/clothing/head/helmet/space/void/expedition - desc = "An atmos resistant helmet for space and planet exploration." - name = "pilot voidsuit helmet" - icon = 'icons/clothing/spacesuit/void/pilot/helmet.dmi' + desc = "An atmos-resistant helmet for space and planet exploration." + name = "expedition voidsuit helmet" + icon = 'icons/clothing/spacesuit/void/expedition/helmet.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, ARMOR_BULLET = ARMOR_BALLISTIC_MINOR, @@ -400,9 +400,9 @@ ) /obj/item/clothing/suit/space/void/expedition - desc = "An atmos resistant voidsuit for space and planet exploration." - name = "pilot voidsuit" - icon = 'icons/clothing/spacesuit/void/pilot/suit.dmi' + desc = "An atmos-resistant voidsuit for space and planet exploration." + name = "expedition voidsuit" + icon = 'icons/clothing/spacesuit/void/expedition/suit.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, ARMOR_BULLET = ARMOR_BALLISTIC_MINOR, diff --git a/icons/clothing/spacesuit/void/pilot/helmet.dmi b/icons/clothing/spacesuit/void/expedition/helmet.dmi similarity index 100% rename from icons/clothing/spacesuit/void/pilot/helmet.dmi rename to icons/clothing/spacesuit/void/expedition/helmet.dmi diff --git a/icons/clothing/spacesuit/void/pilot/suit.dmi b/icons/clothing/spacesuit/void/expedition/suit.dmi similarity index 100% rename from icons/clothing/spacesuit/void/pilot/suit.dmi rename to icons/clothing/spacesuit/void/expedition/suit.dmi From 8d1a4a7aaf2982ad2213856bf449a5a1d229574e Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 20:57:43 +1100 Subject: [PATCH 007/133] Updating avian exped suit dir. --- .../neoavians/icons/clothing/feet/shoes.dmi | Bin 471 -> 524 bytes .../void/{pilot => expedition}/helmet.dmi | Bin .../void/{pilot => expedition}/suit.dmi | Bin .../neoavians/icons/clothing/under/jumpsuit.dmi | Bin 0 -> 555 bytes mods/species/neoavians/machinery/suit_cycler.dm | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename mods/species/neoavians/icons/clothing/spacesuit/void/{pilot => expedition}/helmet.dmi (100%) rename mods/species/neoavians/icons/clothing/spacesuit/void/{pilot => expedition}/suit.dmi (100%) create mode 100644 mods/species/neoavians/icons/clothing/under/jumpsuit.dmi diff --git a/mods/species/neoavians/icons/clothing/feet/shoes.dmi b/mods/species/neoavians/icons/clothing/feet/shoes.dmi index 1cbe0ed4adf6e1ed23a0a067c82dad3ef166325d..842c03257065632d0431ca94e6ee38ce53e37297 100644 GIT binary patch delta 502 zcmVXE_PtgQvXfu=y@Hs0 z6r|9#MJ@==oDse^mV)MSHE6A0q$ZB)xzKVAiE8omf4Ci$@Y2f3!s* zC2=8nU#C}oUK5tW7yxt_MbUh{?(xENer4qu?NgPnTIatGqTa|?CZufQ;&yD|U(0Q_B1NVqu&e$TZTUoP&(^?J8sSTCoaH4iXnZAVcW_c8tt s00006Cv@+BR#iOJpcdzDv>23 zf48@{S65d(Jv|&899!00ng9R*0d!JMQvg8b*k%9#0FZiASad{Xb7OL8aCB*JZU6vy zoKseCa&`CgQ*iP1D@x2we}%B&sxtG+Qu9jkiz*4KOf1Vx%u`6pPpQ-` z&dD!{FV4tMEk@`vLD8kG;OgfBb~XSjc{i;zRRtCR006&9L_t(YiDO_G1*3qbfKgCT z+1MD50+74`5?{o{HKn}70H=CJ7uWQ1XE>KlNy$k`DZ~Y*1~w%XB~=%MhV*imf0Xia z58N8kOWfQ`THqSk++Ez<%gbFvaA{z3aY=D;aS=x1y8-zwj<_@cg9HrF`GNwtoHPnX z0Ss^gAxVI1!zt1<>}KHJK$?zGFbYP&C>RB_2iy~8qY6xzfXe4Ys~_p-7&YFd) rVCBjSD140afA?$@KKIVuP!<4Y6R#w&XM{sq00000NkvXXu0mjfdrP+X diff --git a/mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi b/mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi similarity index 100% rename from mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi rename to mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi diff --git a/mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi b/mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi similarity index 100% rename from mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi rename to mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi diff --git a/mods/species/neoavians/icons/clothing/under/jumpsuit.dmi b/mods/species/neoavians/icons/clothing/under/jumpsuit.dmi new file mode 100644 index 0000000000000000000000000000000000000000..6db5380e589097d1974695e1e9b63837927e2136 GIT binary patch literal 555 zcmV+`0@VG9P)0n=>L~?5`B)O2JDZag_4lX*moils~z8WrV z*ALKKdzmprVh?9HZFf>Eq?0LfJV;@X?k2q@CY7*Yr7|fGH`b3$w4BCeoIOn(TqT93 z5Z90tQ&0|9-hY;6cFHs9Z{wnf8RLJEz}BMv)u^Ezn%CzirqoZe54S480003VNklxh>Z)`bf}iL| zY})n&s_Qx-p3#jS<&$bU9#h~pL5UkG@byi{@A2G6k(Z@rf#-qGI>8Pr80!oPhEkUa z_H!+GkyvIZYRIp66Fa<##Hweh;N7O~fNxO$hD#B3PzghPc7|aX55k}O1Lvp9k9rmJ z2hRL~Gk;(hhG9G$t%1Om*oFj99D5jTJuyz_HUUg$Uves-#|(PSANVZ1oVK6STb6p= tA28k9AJ8xT0mX!_D?!2Q{@_3Pg%3BBGuD|oA0Ge!002ovPDHLkV1k;{`9lBz literal 0 HcmV?d00001 diff --git a/mods/species/neoavians/machinery/suit_cycler.dm b/mods/species/neoavians/machinery/suit_cycler.dm index 4397f39c94db..5a59ed475b36 100644 --- a/mods/species/neoavians/machinery/suit_cycler.dm +++ b/mods/species/neoavians/machinery/suit_cycler.dm @@ -59,10 +59,10 @@ //pilot /obj/item/clothing/head/helmet/space/void/expedition - _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/pilot/helmet.dmi' + _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/expedition/helmet.dmi' /obj/item/clothing/suit/space/void/expedition - _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/pilot/suit.dmi' + _avian_onmob_icon = 'mods/species/neoavians/icons/clothing/spacesuit/void/expedition/suit.dmi' //merc /obj/item/clothing/head/helmet/space/void/merc From c91871d00ef1e7dae065995e90d04d91702d1cdd Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 22:35:43 +1100 Subject: [PATCH 008/133] Fixes shuttle tag on tradeship explo shuttle. --- maps/tradeship/tradeship_shuttles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tradeship/tradeship_shuttles.dm b/maps/tradeship/tradeship_shuttles.dm index 7df1f80cab5d..c309ad625a2d 100644 --- a/maps/tradeship/tradeship_shuttles.dm +++ b/maps/tradeship/tradeship_shuttles.dm @@ -15,7 +15,7 @@ /datum/shuttle/autodock/overmap/rescue name = "Rescue Shuttle" shuttle_area = /area/ship/trade/shuttle/rescue - dock_target = "rescue_shuttle" + dock_target = "tradeship_rescue_shuttle" current_location = "nav_tradeship_starboard_dock_rescue" //In case multiple shuttles can dock at a location, From 42145246ad33ed94c0f7b497ff0afd2b43d6d0e4 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 22:35:56 +1100 Subject: [PATCH 009/133] Adds helmsman role to Tradeship. --- maps/tradeship/hud.dmi | Bin 866 -> 868 bytes maps/tradeship/jobs/civilian.dm | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/maps/tradeship/hud.dmi b/maps/tradeship/hud.dmi index 9c7a81cf7816bb07958855eb5780b60a7db8fa61..c0f438fff7a8771bc22fd8c8ddb25d4392252127 100644 GIT binary patch delta 783 zcmV+q1MvLf2IK~iM>F-M8uOng4KPior>7H1b?fWvT9&&TDQCdIz#Krk@D4(&00001 zbW%=J06^y0W&i*H)scE0e?7%e-mliG8ogy#%xr*arqpBuBz*&C*H`swX ziX%zTdk@q}K#QhxKvu#Ucrtj={-yvNikH9+`;Y^Of*%9)EQP}}t|EV+|VWZ(F;-`E$J*Owk2+25EqiMtMiKRZ@PM`OF1HRwjFU;la zmjD0(^+`lQRCt{2n%k0sKnz3`iHN9Z@&Et2B)GR)r`v*sy!7#nfPE&;sDtkI`yF7c zRslK*a|lobFc^zfe{Cc44Gza(o`IJtvwCz`QJ`!Pg{rO>3U~*hK*?Y_TzS0JO9YNb zBJkSac`!OqFA|^~cxmu?C_1pZz+Z#!18XnC*9LHLuEVd$g#2HjDfvHQlk&fU)AFCu ziTM$pnm-w2=BEo}zXaKnFnbwhzY%4>6=#1KWq%xlFC;nne;XU1FQsYu8yet^Nn-v+ z25fV>fx!Ig|InQLv0l9m%JtLPw@&A#Tpv$3!@5(fw_Vp+*Od(#e|odx5SmF4)PrKZ zjeH<*asf0#^9~s30Pf%wv)#dcgb+cs!f~^fksKWY@Qm z4+M6xii!hRe_m(HPzWJ}5JCtcc9&p&o!uX}2H^Q`K{3JW2I_u)0Np>h_Wk|d_ho~N znI|BDaqm~IH<4f78*+j1`H6rVpbq%%wcLSw00nMngx&!p$acqX3EaR4qmJf)#T||X zbKs3hi0bSP3l&(r4B7nwwhV<3LI@#*5Q6USAHn?VQ5o$20gquY8-}6*yPm>+9cKdU zdW!FE4g7k(eg`Ij#18N|;Ghn`e_&A3=K$T`vt`Jx7eWXjgb+dq!Ux2a?1b! delta 781 zcmV+o1M>Xj2I2;gM>7pDP4%T3^PeXZNp+{Er|awMT9&&TDQCdIz#KrkVC`y<00001 zbW%=J06^y0W&i*H(2;r`f1-9r{H-jg2z8+EU=p_pZ5@=l^z})p#ERMOr0?vr z*Q(a#tx_+HqYtD{`ncJuZ1$F2GKam&9QxMrYDNaeB=cNl*2gi)oywXB1FrfDxXDh` zQJ6`B-g}@<0$Mbk1F{m~p?_BRROA$bY>n8=5S)OtdUq9#aef5IR^Juyat9-0Oc z3vG%@at^`%Q)xZI2E#$bFZ1Q}Iz8fu5RH>HS~mPn6#7z^pO<|D-HX!u!y&sD0005_ zNklJL0E1Gj8!0R|e>k3uWd>TRMVjKUp@45-g}P~03TOwRfM+mYt~FkoH3FwoAn@AY zanU-^tP%)2@Y3Mxl67EnfxiYn7q;GpuMObl+=i#fg#4$_l>A?@N%`NwY59-n#C!`+ z&7Tc2^V0>gA3^pa%-)9Ce~7aG6lZ@JWq%xlFC;nnI~$-cf2C>pI~w4@Br$&{gJ?M2 zL120HJ+z(vEU%vpzkV_Nde`gd)VF@UyrB2%=V2IR7+izP)$k2k{q-X5Ew;0uTR&Sq z5D>Xu1qgI10Pe68?SP;T6afJpC=A$tXot`v5LE~|ApRYeHB#ze4QM=E z1NsOAbRc-ff9)*bcfj&jEW*lmnR|nAeeE_Rgb+dqA%u`{aEQ(aZpQNW>*yq4bn1GY z%>3E#HjelEIJySW`GN`vnqFJW_h-XMAeye{4uI*kGXZ~kzTFMK17hF~paX Date: Sat, 25 Jan 2025 23:14:42 +1100 Subject: [PATCH 010/133] Fixes incorrect atom in stacker squash message. --- code/modules/mining/machinery/material_stacker.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/machinery/material_stacker.dm b/code/modules/mining/machinery/material_stacker.dm index 4db34e69b37f..593137e6e404 100644 --- a/code/modules/mining/machinery/material_stacker.dm +++ b/code/modules/mining/machinery/material_stacker.dm @@ -44,9 +44,11 @@ qdel(S) if(emagged) - for(var/mob/living/M in input_turf) - visible_message(SPAN_DANGER("\The [src] squashes \the [src] with its stacking mechanism!")) - M.take_overall_damage(rand(10, 20), 0) + for(var/mob/living/victim in input_turf) + if(!victim.simulated) + continue + visible_message(SPAN_DANGER("\The [src] squashes \the [victim] with its stacking mechanism!")) + victim.take_overall_damage(rand(10, 20), 0) break if(output_turf) From 9a8da2194f531d1d746246ead0ef26c1bd9e9ecc Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 23:17:14 +1100 Subject: [PATCH 011/133] Implant messages use the atom name. --- .../objects/items/weapons/implants/implants/adrenaline.dm | 4 ++-- .../objects/items/weapons/implants/implants/compressed.dm | 4 ++-- code/game/objects/items/weapons/implants/implants/freedom.dm | 4 ++-- code/game/objects/items/weapons/implants/implants/uplink.dm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implants/adrenaline.dm b/code/game/objects/items/weapons/implants/implants/adrenaline.dm index 7c3f0036fa7c..e93b99158db2 100644 --- a/code/game/objects/items/weapons/implants/implants/adrenaline.dm +++ b/code/game/objects/items/weapons/implants/implants/adrenaline.dm @@ -31,8 +31,8 @@ imp_in.set_status(STAT_PARA, 0) /obj/item/implant/adrenalin/implanted(mob/source) - source.StoreMemory("A implant can be activated by using the pale emote, say *pale to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted freedom implant can be activated by using the pale emote, say *pale to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the pale emote, say *pale to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the pale emote, say *pale to attempt to activate.") return TRUE /obj/item/implanter/adrenalin diff --git a/code/game/objects/items/weapons/implants/implants/compressed.dm b/code/game/objects/items/weapons/implants/implants/compressed.dm index e9872331439e..ad6dee6983b1 100644 --- a/code/game/objects/items/weapons/implants/implants/compressed.dm +++ b/code/game/objects/items/weapons/implants/implants/compressed.dm @@ -27,8 +27,8 @@ /obj/item/implant/compressed/implanted(mob/source) src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") if (source.mind) - source.StoreMemory("Compressed matter implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted compressed matter implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") return TRUE /obj/item/implanter/compressed diff --git a/code/game/objects/items/weapons/implants/implants/freedom.dm b/code/game/objects/items/weapons/implants/implants/freedom.dm index 720acd8685f4..2ec9c0890aed 100644 --- a/code/game/objects/items/weapons/implants/implants/freedom.dm +++ b/code/game/objects/items/weapons/implants/implants/freedom.dm @@ -50,8 +50,8 @@ /obj/item/implant/freedom/implanted(mob/living/source) src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") - source.StoreMemory("Freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted freedom implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") return TRUE /obj/item/implanter/freedom diff --git a/code/game/objects/items/weapons/implants/implants/uplink.dm b/code/game/objects/items/weapons/implants/implants/uplink.dm index fece5d1fc373..27e733c583aa 100644 --- a/code/game/objects/items/weapons/implants/implants/uplink.dm +++ b/code/game/objects/items/weapons/implants/implants/uplink.dm @@ -13,8 +13,8 @@ /obj/item/implant/uplink/implanted(mob/source) var/emote_options = list("blink", "blink_r", "eyebrow", "chuckle", "twitch_v", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink") activation_emote = source.client ? (input(source, "Choose activation emote:", "Uplink Implant Setup") in emote_options) : emote_options[1] - source.StoreMemory("Uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) - to_chat(source, "The implanted uplink implant can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") + source.StoreMemory("\A [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.", /decl/memory_options/system) + to_chat(source, "\The [src] can be activated by using the [src.activation_emote] emote, say *[src.activation_emote] to attempt to activate.") hidden_uplink.uplink_owner = source.mind return TRUE From e9b0097401d5327b52a9255c2c6baef7b5aa52ca Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:44:35 +1100 Subject: [PATCH 012/133] Added a Jorf! Machine Gun. --- .../projectiles/guns/launcher/foam_gun.dm | 14 ++++++++++++++ icons/obj/guns/foam/machine_gun.dmi | Bin 0 -> 2964 bytes 2 files changed, 14 insertions(+) create mode 100644 icons/obj/guns/foam/machine_gun.dmi diff --git a/code/modules/projectiles/guns/launcher/foam_gun.dm b/code/modules/projectiles/guns/launcher/foam_gun.dm index 33eaae8345c6..af3cbb1519b3 100644 --- a/code/modules/projectiles/guns/launcher/foam_gun.dm +++ b/code/modules/projectiles/guns/launcher/foam_gun.dm @@ -80,6 +80,20 @@ if(distance <= 1) to_chat(user, "The hammer is a lot more resistant than you'd expect.") +/obj/item/gun/launcher/foam/machine_gun + name = "foam machine gun" + desc = "The Jorf machine gun, hose the competition down and hate yourself while you spend forever reloading! It holds 30 darts." + icon = 'icons/obj/guns/foam/machine_gun.dmi' + w_class = ITEM_SIZE_NORMAL + fire_delay = 0 + autofire_enabled = 1 + one_hand_penalty = 3 + max_darts = 30 + burst_delay = 1 + burst = 3 + burst_accuracy = list(0,-1,-1) + dispersion = list(0.0, 0.6, 1.0) + //the projectile /obj/item/foam_dart name = "foam dart" diff --git a/icons/obj/guns/foam/machine_gun.dmi b/icons/obj/guns/foam/machine_gun.dmi new file mode 100644 index 0000000000000000000000000000000000000000..fc2ab213fceab41b77577a53089e70f2c1309d04 GIT binary patch literal 2964 zcmV;F3v2X=P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sXV_ZCq;>iGbOXA7|1u|;!G<_%uR)`;i@u9a})FOGgB0j@>42x zi*xcz;&b9N67!IBnh>qC2(M0M1y?^8uvY+I>pv-SnZ$Vj01CuOL_t(|ob8=^P*m3) z$A9O(cK7bGusoKBs4NC8h*qbQhWLI5U-$^9qcL@=O?^ybXBzEa?FIWsJGGs}q}nD; zI%;BzjY*6`P14$oos3DQ<6{y8LsS$~1tP2h3%l&@Jw4~5n_YxNxcf4m&&-|WzRvIW zyZ1cqy?oC(01O6$!C){L3~lH=z0_hhkfmw=Vngj!{gErFpJ_{jxYYp9(BpS7u9EH zE>veHXW>d~4t_0dw7PHDSoJ{iD77-tp;jj3sQXj%)B{$gGb%R7SArbFAHDXrHW=59^3mG@c^);rde9seBMX* z{dxE}j_>j`wib>WzU{=ZK>6A~tWbSx$7b-8D({1ftuT9{BjEFm4cl<)D?4e$6}S;i ztG8&srN|uG2E1SM#aAml4`aPvM7NFWaB06>k`0WuB;XN(PJ1%Qx0=B#2_SWGU~;)3 z;d%>rWFx3Dpmuv2=KOvnpKHO_3UWa(7(udFzApBd+ozb*?Vx&na8tG5tlCT98f(YU zd|um!jS?1I-C4vIt(JUu&Y`{-QJv;6TVuq zWSVpEv@v$f8w_}Qeg;OW3Y;K-sjVH^E?ot;w+B)$Uqglt7uYWU5BaSUa5e$;B+DS& z>;~?ti)2L}5^p%Q^xe*zQ2hMP0jq*o+o${JF%<0_a;}!for`57iKARq5lgA*tBORo+F0j_N;9S7~xq=ZKMj3K>19BM6I6El`E%KP zfAeU?9S34u!@F1M2gS=J6(D_C+#SUMA&hmJyFb{aC1hR$uXg6i=hS7sXSkxk$+NYE{b z&_x0|y!{8@?sUPNgNI<)sWb4;D_8r?fw8u~;igl0sHPUqWn@6zqvK)t>CeDpG*nb| zd>J@qv7B1&PP0`UaW)0o2I+5qP{@q}cbgL~{Nuer#Wv_S;bU8VrrqJiuk2PqlAx+| zIhHr2f``<30%>^sUN3N>06Zzmq(l`B(-0JNn7yjt_EkiEVQF}|JAIEmj zo~FJqYnt|=^Zcx-YOL+kh5k*q(S5P_fS2&ihkUE;#}cj7MEg5UUt(=PmORL@GZ+j8 zgTY`h7z_r3!C){L3_rILMvv5_f40VJ;3dZ$sQUyxmEpic)yGrfxPL&zWc(o|U;uqQsFH{gR`K{r1p$3LDcz_Ct6D3fM;{+d zoc0fhX#63K@BsRFoXZ=)AsE2aHBwSQt-~}O#%6Mq?o_^ z_o^i`LzA61Ke-iFJyL+oH7(dn8egHc9l0}7Fh{B(Ad5;GK6<&To>@z)5hy-V1s;zF zwx2lJuaB{aKcos;JSs<_l|tjBBH%4DTwXX0E*4MLmiigrgZjx6puS`V)REtd%jd$m zoRQFT;v?XvJPdEGS?>K2aJ93tk2gO zzwZ7CgT4WM^!ePXM+(4P(*j=E$O*0Oes@L+3ex8za=HBRtk2gOzwZ7C;g~-_lsBa! zPkTGMJ$^sOiGs?DqC_r=FAU@NYr)ca0qD~a-#dOk&`BKV`2BF^0_YvTUuXQf<}Zlq z+hrW<^JCgSAzH!4BXQ9`;ePtY5^m!4%PNDxU@#aA27|%)7W03u{fJ!Sh&71-0000< KMNUMnLSTYwg1wsn literal 0 HcmV?d00001 From c2fbae045fc07d5a2cd2e70e993280bc60c40b2f Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 20:58:05 +1100 Subject: [PATCH 013/133] Removing extraneous icon path from avian shoes. --- mods/species/neoavians/clothing.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mods/species/neoavians/clothing.dm b/mods/species/neoavians/clothing.dm index ff9f7c78b8b0..3447d185d3a9 100644 --- a/mods/species/neoavians/clothing.dm +++ b/mods/species/neoavians/clothing.dm @@ -48,7 +48,6 @@ name = "smock" desc = "A loose-fitting smock favoured by neo-avians." icon = 'mods/species/neoavians/icons/clothing/under/smock.dmi' - icon_state = ICON_STATE_WORLD bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN _avian_icon = null @@ -88,7 +87,6 @@ /obj/item/clothing/shoes/avian name = "small shoes" - icon = 'mods/species/neoavians/icons/clothing/feet/shoes.dmi' color = COLOR_GRAY bodytype_equip_flags = BODY_EQUIP_FLAG_AVIAN _avian_icon = null @@ -100,4 +98,4 @@ icon = 'mods/species/neoavians/icons/clothing/feet/footwraps.dmi' _base_attack_force = 1 item_flags = ITEM_FLAG_SILENT - w_class = ITEM_SIZE_SMALL \ No newline at end of file + w_class = ITEM_SIZE_SMALL From 5385ff031cf308713ae48ac21cededd8abe4c26d Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 20:59:00 +1100 Subject: [PATCH 014/133] Correcting poncho path in corporate modpack. --- mods/content/corporate/clothing/suit/ponchos.dm | 4 ++-- mods/content/corporate/datum/loadout.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/content/corporate/clothing/suit/ponchos.dm b/mods/content/corporate/clothing/suit/ponchos.dm index f8f204560444..17f39ecf2d04 100644 --- a/mods/content/corporate/clothing/suit/ponchos.dm +++ b/mods/content/corporate/clothing/suit/ponchos.dm @@ -1,10 +1,10 @@ -/obj/item/clothing/suit/poncho/roles/science +/obj/item/clothing/suit/poncho/science name = "science poncho" desc = "A simple, comfortable cloak without sleeves. This one is white with a few bottle green stripes, corporate colors." bodytype_equip_flags = null icon = 'mods/content/corporate/icons/clothing/suit/sci_poncho.dmi' -/obj/item/clothing/suit/poncho/roles/science/nanotrasen +/obj/item/clothing/suit/poncho/science/nanotrasen name = "\improper NanoTrasen poncho" desc = "A simple, comfortable cloak without sleeves. This one is white with a few red stripes, colors of NanoTrasen. Go NanoTrasen!" icon = 'mods/content/corporate/icons/clothing/suit/nt_poncho.dmi' diff --git a/mods/content/corporate/datum/loadout.dm b/mods/content/corporate/datum/loadout.dm index 855177a3446a..eee71e7c71b8 100644 --- a/mods/content/corporate/datum/loadout.dm +++ b/mods/content/corporate/datum/loadout.dm @@ -103,7 +103,7 @@ /decl/loadout_option/suit/nanotrasen_poncho name = "poncho, NanoTrasen" - path = /obj/item/clothing/suit/poncho/roles/science/nanotrasen + path = /obj/item/clothing/suit/poncho/science/nanotrasen uid = "gear_suit_corpponcho" /decl/loadout_option/suit/corp_jacket @@ -121,7 +121,7 @@ /decl/loadout_option/suit/science_poncho name = "poncho, science" - path = /obj/item/clothing/suit/poncho/roles/science + path = /obj/item/clothing/suit/poncho/science uid = "gear_suit_corpponcho_science" /decl/loadout_option/suit/hoodie_nt From d51b2eece4480676505dd7c91cb46a05048361d5 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:17:57 +1100 Subject: [PATCH 015/133] Removed overdose from slime meat. --- code/modules/reagents/chems/chems_nutriment.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/reagents/chems/chems_nutriment.dm b/code/modules/reagents/chems/chems_nutriment.dm index a3e914152d12..b8b7637fd6ff 100644 --- a/code/modules/reagents/chems/chems_nutriment.dm +++ b/code/modules/reagents/chems/chems_nutriment.dm @@ -32,7 +32,6 @@ lore_text = "Mollusc meat, or slug meat - something slimy, anyway." scannable = 1 taste_description = "cold, bitter slime" - overdose = 10 hydration_factor = 6 uid = "chem_nutriment_slime" allergen_flags = ALLERGEN_MEAT | ALLERGEN_FISH From 4e5131f95bab0d84b231d1609a01520d2e0ef67d Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:18:10 +1100 Subject: [PATCH 016/133] Forced human species for CI testing. --- code/unit_tests/mob_tests.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm index 5867dd2ca904..39f29302170d 100644 --- a/code/unit_tests/mob_tests.dm +++ b/code/unit_tests/mob_tests.dm @@ -77,7 +77,7 @@ var/global/default_mobloc = null test_result["msg"] = "Unable to find a location to create test mob" return test_result - var/mob/living/human/H = new mobtype(mobloc) + var/mob/living/human/H = new mobtype(mobloc, SPECIES_HUMAN) // force human for testing H.mind_initialize("TestKey[rand(0,10000)]") From 450e55937572d3e634aa67dc52c202626d19a6ad Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:19:55 +1100 Subject: [PATCH 017/133] Removed broken retaliate path from goats. --- .../living/simple_animal/hostile/retaliate/king_of_goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm index faae358b3884..a2dc72cb942b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm @@ -148,7 +148,7 @@ boss_theme = play_looping_sound(src, sound_id, 'sound/music/Visager-Battle.ogg', volume = 10, range = 7, falloff = 4, prefer_mute = TRUE) update_icon() -/mob/living/simple_animal/hostile/retaliate/goat/guard +/mob/living/simple_animal/hostile/goat/guard name = "honour guard" desc = "A very handsome and noble beast." icon = 'icons/mob/simple_animal/goat_guard.dmi' @@ -161,7 +161,7 @@ _base_attack_force = 15 sharp = TRUE -/mob/living/simple_animal/hostile/retaliate/goat/guard/master +/mob/living/simple_animal/hostile/goat/guard/master name = "master of the guard" desc = "A very handsome and noble beast - the most trusted of all the king's men." icon = 'icons/mob/simple_animal/goat_master.dmi' From 5afa3cc51f6bf3f0800af87e114587b712bf7de1 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:20:55 +1100 Subject: [PATCH 018/133] Added default accessories to robes. --- code/modules/clothing/suits/robes.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/suits/robes.dm b/code/modules/clothing/suits/robes.dm index 4ffdbf004b71..1f9a011bb288 100644 --- a/code/modules/clothing/suits/robes.dm +++ b/code/modules/clothing/suits/robes.dm @@ -6,6 +6,7 @@ body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC slot_flags = SLOT_UPPER_BODY | SLOT_OVER_BODY + valid_accessory_slots = UNIFORM_DEFAULT_ACCESSORIES accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/robe/thawb From d6a270b013f7d97bc2542b4803eccc3f12f8ed5f Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:21:09 +1100 Subject: [PATCH 019/133] Fixed broken color clear on aprons. --- code/modules/clothing/suits/jobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index f617d8bbc165..fd5da2f0d8fd 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -21,7 +21,7 @@ /obj/item/clothing/suit/apron/colourable desc = "A basic apron, good for protecting your clothes." icon = 'icons/clothing/suits/apron_colourable.dmi' - color = null + paint_color = null material_alteration = MAT_FLAG_ALTERATION_COLOR | MAT_FLAG_ALTERATION_NAME | MAT_FLAG_ALTERATION_DESC //Captain From 3b119a11a555bf2cfa41acdda1722e589fca4d9a Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:23:11 +1100 Subject: [PATCH 020/133] Gating against runtime in mingle_with_turf() --- code/modules/atmospherics/datum_pipeline.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/atmospherics/datum_pipeline.dm b/code/modules/atmospherics/datum_pipeline.dm index 51634ba2d586..e3ff1d1b5b97 100644 --- a/code/modules/atmospherics/datum_pipeline.dm +++ b/code/modules/atmospherics/datum_pipeline.dm @@ -168,7 +168,7 @@ /datum/pipeline/proc/mingle_with_turf(turf/target, mingle_volume) - if(!isturf(target)) + if(!isturf(target) || !istype(air)) return var/datum/gas_mixture/air_sample = air.remove_volume(mingle_volume) From 914a3cf8ea578a2a3ddb04c9ac512ba89f2f3301 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:23:23 +1100 Subject: [PATCH 021/133] Entertainment intercoms now broadcast. --- code/game/objects/items/devices/radio/intercom.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 882706ebc6f8..d019ed057af9 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -86,4 +86,5 @@ ..(locked_frequency) /obj/item/radio/intercom/locked/entertainment - locked_frequency = 1461 \ No newline at end of file + broadcasting = TRUE + locked_frequency = 1461 From 7a889bc6ff7a13d09430ce555de28a3dc9fde419 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sat, 25 Jan 2025 21:24:19 +1100 Subject: [PATCH 022/133] Small icon tweaks from Scav. --- icons/atmos/tank.dmi | Bin 8908 -> 10194 bytes icons/clothing/head/cakehat.dmi | Bin 617 -> 611 bytes icons/obj/items/storage/backpack/backpack.dmi | Bin 979 -> 1070 bytes icons/obj/trash.dmi | Bin 14964 -> 15156 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi index c36c231a14e67952c14252d01ea402b539767782..4a10b295ee33bfbbc3288e737d173140ac7a08a0 100644 GIT binary patch literal 10194 zcmX|Hby!s2)8A!*r56DK=@Jo;lJ1nHa|NUu1f;tKM7op?>68v>knWQ1?(W)s_xtCJ!hdQ>d$h@M23f;8&7n6~cWM<*$CIl;FH z=YxCl9ChBKvSh{*yeSNJ8J}!Y#C5M@!^uYG#ajzZjMMnqH#i*$0MG#Bq$M;x(vLGd zeJG}Xp0>mEVfy;Z>J2lAEhdp#IJ}(35pt*uwib>UQjBN)!F>!kj05;ajIoZSl27q1 zDU~e@?7_o*1B!Po99`lY-K_P59h|&`rlw{bE0t$-1L_I~GOZuAw6t2qN}5^cXBNJW zb)TPJPRQ0Rd8=f!6^@GRE;-v{lJnXc3I92+UpyKeRR%DsWDbw{!<~)waH9wd_f&9v z9l1ji-|1Q;#qfPuvVt(+jnB^y*flI$*f0H=5LL^NcMOMvWerK?K&-m;!)-SUHUnl{ zte^D=U({(Ui%Hs82 zc>-ay4`BhAZ#26dZy+Z#CJd-13hN}suoyBCB@26U`L$==U+y~3n6&u3i_(D>98NSp>=eAZQQ%4KW_U*?6< zR3&Q!xqVBVA^algWh;AaNq>(PZeHHDzG=&OTXqv%6q==cDxWWw!69PzG}YG;+gK)`^x7)Bg^UZ zbhSO}{V0DB8a6Rb2?-9m90NglDg{Jws{8Po00({92FY8`|M@z|3L!?f8{n6~QA7i=ojG&H)l1`^&9Vb#{vHP)7vlob8`z1Neq| zi^GVDilPv7vEtqmb%3*Uf=3WV*Bbm3z16G?ayhN7%ajq-^Q@@_ams}gt{L_9yqd7r z#1W0I4Iz@ICJ%ELphY5?7cdxjLOEX@X@v}Of2&#lu5*APR1}0GajKYzpBq72{)(U< zOoEQ|L)Cg4sRa|WvwTI7#-!hKzB7eGYA~4V-@^jy zYNzc%P7$Jx!JjOl6k?${JZ8G4Tjs*9-?shJuR=H5>*{`*i#@!U=35fK#^pPETt)cJ z)qiW^%LCYAhx|dhRf?#u;94XPD7%CiX{G@W4_?x0F8-)6SPHi_L5O5vbTl5)o8E7A z;fCI*VWba z-2SPxbb)lrlXLAmYIVTJ3WIlLIyK+4S$lJ2B8tk(k?#1XJf!@vs3e>zTsu*QEvbtG zCp9(I>dP04^Nk*WVhUHtbg34$>3PV|cA;VlO2y`SghwxJjzj$3;9jEJoCh@yZ!8uH* zC_rVQ<67FGzD-BPDYKDO9@~XlYt3Q2P^C0p+956yJqKVs1Ja(}o6QG-AxJ;t#0i?2 z`8cayj*8H~_djXey&JX^-TWN5o9X>U?aB*ImiQfAr*Wi_g^ubJ)mFByo>lc4uu;h_gnr@o}X zK?i#R`;=pSNDVp${vtwm&?2wF{M%?g{7+dIC?7foMiE6V0S^3%T3RF}CGqn497+l0 zhpB2-)*+M5uV_r+T6Qi22jaJE#a zUXZLBQEFP+{_*kaw2_=c!F30Zzbygh7wwzJnc?@V=WdX!yKZnFq6jo?4$HMBo3J91 zi(jG^hru?^|B&BCOVgdS%A2kO8ug-~43f^y@8cO>#Pq4bT=AoXury{{uFbtj|>{?4x})c&iM%9&;Zd3YRI-;_+`V=?n^Q< zGJ=dM)$?VKv6~W&Up$)#f0dU;qM~#8V#X_}Ps11WMY&_(- zv-u~7wp}x*Jl#o9J@g6v$NeJ8|Bg0?i6EjUmLcqTu>qu+{sL6#`{>3X=d{}eCX>`C zR7RuN#C9O0WBdzX+0=#))ehEn?gs=uHTal}(oppVIV~ru4BsOc$I0?1KfkB#cEuZ* zEaoptecvxT&K+gTJJfpXOC2EFb{fpUqhvZ&pycA_#)b5oFYV86ypdekR{Rg8AAdV7 z>Q$SC9r`D|cPc3d^BAkNYL+erS)jO2CP5pdDaPDZu&__gyr~n+yFX5=Jm_8)u-Nk!(Q=+IB2); zN?48<5#mh_qOccHWE-Gs-}*8DR{9Y*J~{anX{gK1Njp0hlG*t4wuyWz9-uCcrHjo0 z5NS00w(VAgNM^m|a#U)Hn;;BTUtb@YP{C?MZ*6KI;qZZeL{U_SO?l(D!c4D0*xPsc zcNZ(I-avHy_MKE45BUAA?ASW#UON&I1nnhd8Fzid{fo@A&w*27^LNyB0H2$hEK2T7 z9G-gHxk?EuYwM~Zb$&H|8AMRF7&H4?abYGI%=G7sfDEFmP%MYUfo{oZ=$)HEdZ@`U zxC4J|ZN89MH;C_}@WiBvz1?S&wcO?9C7tZL=fZE)`o49~Zu*n}OW9nXMsDuNm${RG zckaRm(R>h}+d7F1$S>{3#`BqoB7BrCsq{Yjfh(6j% zD{bbBczdw_%z69MgeTW9ikk=tm@KrwhjGFLovI+`oy-{Hy_QBh%5Uq^OGGl}=Z#vw zn3%n9ZL`HDB6PUrZf?*2V*fmbR9+0S91r=5dijbfLqh&+mDMoqIF&6_hwLg4D$SCj zH)Q#XQf0+xt$K#u5@M1$3C!#|m1#G-J(UIxWn@LbNfZzpK$qn_v3;{t=;Zle7x%lb z(|($;jTHaZtOskYj|`~WqpJs(=VK%W-+zw8v&d`)6PCp_V59le)qPLxHEh4YN|KV1 zR6X&T;=a3k^W`sxOT640LfH!nd$BZ`go6Vwr1Z}VSucu8enT+^GZ6Jm)f)*}dC5a@ z??UE#2o3c`r7*3a+nnpfe85inP2T2eL868z_zqmW&HJhjTbFo7z+EapvGsZUx< z&J7Zs1@bj-KcSEtJc+hHY!8O71XxxykG9zi5-H04^}ef=qR0QWdYIotXnD8pdbMM*-t$_xV?Q(cf6Nw;2_lQV*sDJB;IHJHw$y_!CfusC)S>yG+E^_#|pJe`**So z&8H9+%5eMNMEV4Y=)QA4p7VqdY?f-Y|IA@5)0geuC;H~5)uUAuaHY3!{B+@Y&t75K zZ;|ltAFuPe%&e9fc3I1X{C{$e+mYto9!XpXT>Vz;{ol;7(e2nxN0fCA#NkGSY%SV{ zNRaen6H_XhsMCz18P9hu;<>sC$h3ED$xg!FfgGp(N6>X0*)%ZB&i=UY4KF+_mP_#A zkuyT(b0RA(4aQuFyw{^!9e|iWVc$|iV^NWV)T}Rhq&r6zKX@=b0m?0(t!*|L zLPBun(Q){CdLf)+?f0z}*?lw~3O31xjjc3B2>%~*?9Axs7eXG=?7vEd^n-SD|_zQUb>n0H7fU#{Qq*Pki zHs@yE-sx%h%=|%E`Q-U_;7tPRs7TVh*c0v4NpsA2L!$I#2NR=CD{o)HZxOQ^ooWH>#d_;yBxnlNV5)}NbIUSo z`y<6-_|BJ0lochD!2kOfK&9-6qJ@Gri^! zn0dyG4(X#$I6Cd(aG80!5u2+mPSInNVLKe|J@&eFg&)+jnaMFy#l$MV!9bPVaw>lD ziHee~ZI|i>u_wFNNFkf)m)bGJo-kyQVGQZFU;MCxZ73dVejy@)5r!I-1?M&yP+)?9 z-f*GIwkGo9WBf@es`5xxtp9Ef>EGEbgdP)XATiXB{OM=pU6?QUKkWhY95kW%aWggPbs@Kd>*u(da?e2FZGETm}+WXvdypnGbhDWD;Cnp6Sd-zfQ*IF3y z!6}N-{fK0)uM9Dl?b@{ifi`QkD%a$JYM_dVbtp%*pMJ=|Y(64$ zO!C6&Rr3{hj;tg;D%-;x7q9)p^&hM9W`rMGE5c7&#(2>8mUDlTn!5feE{Yt;WKrV+ zKWyIs!jWUUnUmM1obbpV(_bZ6O@13s4PsyX9EXpiroEE5ach1sapI$`X%UX!(@R{V zjXU?*51K9Vp0->rBrlQ^J$pYneyytu7Q1|v$dRf+(#5uLVS{Y%ZxxR@hva+FL(FL;rt}0 zsQ}ljTp0n3Ef{5HO$tM5`$8-GkbxFWw(GDQ>$!TRwo+`Fcn)$hj;1CLlXvGOj`hCInXwjmbQ5cn+7{g5Jskoa^!CODU3i*VVqF*e1@C zot-M{#w_q%~6w>ot>0XMz!j{ zwfmR%Tlv%y_^9>mby@Q@g_ZV(VA*I2+6-l*mr8D@E0U}WFwSQe6$tNIiaT5q@65nwd0N~#7hv&Yq;YA&~&&7fB$rE<;ro~%q?-;ltEv-RL* zqFayu{Cui^ZGU^48{CzAFKodb-gnre%f!)8K6;+`t+QxJ{5R1R*%2C%9?AG=!h|bm zu|7^X+IQ`|UlXmjK4nUkDbeD2khslGC%NgQDL|bjAjMhu#nfR>ZV8kMGEG=38!)z8 z`+gjo183P42;&hK&2kP!kx_dgLXi4V#4OD;5LWFQ{)UDSm@`h*JV8DFs$HcA^dL_8CxPqk91}387U4SdC;f-ow$!+n2U- z;>;ts{oB#2)E%dgCNl9c$c^a#Pu{?+_qqNz(?r(6zvFkm#Dv-Ja0!&c>IiEIFjboY zq^ihF5oy9Yt7W9sa(MGpS&9E#_JVswXkE%kI50q8#Z$*Zk8Xtw#IplPV#&xjB4jdO zRfbJ!JJ7MOY5yVXD9wIADQW|JoRAi$Au8)*PSvZsirCD=7o5Q+4F*ckyv7%w;5N&G z3~;Lfs%px{&*~;ZeX2dQA7k%^=rn(; zYi({vz8W3;_a^iCYST}kO*;s(gQ z+(6{qpkt$k9Lk_Hnqt@$7@d250vWKLjh5~_8X|4_tmo00 zanZ5^#Xc))Cz^J}MNm1kWw@?DGOr=5L#H8EYDdS1zdJh$(auoH0|?w@fQA z|1`OrajVR*(vtFhIjvmGoMkr=x0AjbhT2w*3YjOiKYdc_Kp(QD7tWDc=h7DQd_ zt+(@0Qo7o8y2AlspUv@3eU4S!Y4 z!UCg2)2$vZ7g z&b)@Hhpyg^9vda;w|1vLe0ddj5nl8r2rH3V$E7!2j~4{}0Xp-`QesQXw))w7s7N+N zfvDai%;rs?{mA7t*%WP}gOPs^rYB{{J-m}2Do$vmxX&@oQq(M4-Vo_n#3 zfdP9e7O_1zXhSNnpA|0C#^a?POZe9JnX85&2b73W(muK*DE{SR@raqKe0h}G0;QBD z>}$Sa%0+AJSZKo**T+-{AXd3AmH};w`|OdDY&-g=Is4}URn}FF>3}p2b!$=aS0h77 zgu~lsiNra?3dak6Vz7M0xAw4?+Qjcq{(#gHIpgK9=*Ow2us2}BS29!oX3^w7RsoXD z-piqON-=MfTHX8L&A827i366W@-%gso|1?>%HJZ|D7d)63uhwyUzAB`z7h?wQ9r!?! zWh%)!4ApP{0we%gJ9>N<)@E{a3(kN6-Fqq#!0CtFbj+&|$$#qVfdye?cvFTKSWhML z=zDxhL@;v|!4Vh651^}SflUvZwWG=G-5TwWjV>MDkBKef)EvZT0Ui7q!w2@v|g>lijhSZh4heC`xB2CTec)P3bwIK zs?c6i6S;zkIIDqM;b^tO+*uyYJMx@loO19l(YYDCso*IQJzw-~kUF-v3CITEM#2@0X^T zLpfp?!C*raf#%h`D)mcz6K7X}xN4NpGCT6+5YRS_T7f{_^3Cr~nwvmS?JIQLaLGEF z*alX&UXwj4h#_n7a<*k>-?yfR0YJCOvUINgziFPNcp1XGT4v!KaE;YumV?_~*>7iQ z_Ibm3Y0Xy+i90BnldgI7yrbn6eJhO#QjHX@CGz4#oU9S8=lq^(TkHxS)*r$itcW^V z8f)e}9B{`F4}~ZlJX!E~eGc_*fKD-)i|@*k&e6){%A5ctdd<#AuKySn6-)6|g}zf5 zWrN+g>u1!!J_BEv_Qxhsn-$@e#a3_0{jp?6;>A_Hv4uKz41ktF<3BcH>^yZfVJgq@ z>sRkbH#!2{8GpcsJujiH_lz-Rx^DnW-aRkf{HrjEi6mky$FEZ^cP4n{;j-@l$Ntri&sSsh)faTn}brek-$FC`CMrQmSOW2!Q%~P{^+k! zFghiq`#=8wu`e&S%T#?>eKmgH@oO{C!)#e_eTAjGQcQOeh2B`xF<>RgboIat`9I}v zi6g2;uZAU4x2Y*)Ke}*K^)7~ROHf%e!|@mbI7>(*evFzVIKFIZzE6XA`ob+gWmdK- zDOa1eJ?08GtdBZQ*jrnt^!Gg^bQN)TqyjJZLz5cjkX^I2r~*d6$w?Dx1Ham(R7|}r zf8QbbhTj#dKK)d4_kfjx-#!J~n2(2i)YU4QyF}l5zmpj$DMW~X_A*gxq#UM*I4;gI ze9t0}F*=nb`Bsy0!$~st1AH;91W~{NHZ1>eW*f?CZM47XO)J?=vl5TCVu{#P?H~6| zlx6|Nl~%grYfe8*OS>I;hG`#&U==fNl&yJEl9X0zJ-3P>5(tZmln_55d#LPjlp!_c2VIsRtw&rheTjo3SqxlTV zC=!~{5zbDtc7Br({jqtMO$tSGdWRF6iudF}uziKYhifpa8GvI0DzkPJL{ySItf1!C z%KZMxzi@wYA0So*Ie60vBGI(K)?2Nf6tx-D-#YH9Jyy>CoPWGIRlj(@eR+|U8R(){ zP&F{NjqUF=NK6W(?*-x&bdDRJyi~Oj&mpPilpSe~x}&`pRs4jqun%<7Am_hY1SJ!m zou7F4gDob^&g01#XajN3&GhNlqkwy zBAEbHys8X)Zv!SVGAj%vE;nK{Joc@9PU{jD7F4EXgNp21Vs_V5pzT-Ofs~IJ+8i&^ zdfi=n)reBM>;%XTaM@aEJKp(|Gc0JVUDtW8_&0RyTMj;%=)M$!|GMZ~E!-D0TmQ-P z)Jf#FDm@I&Y!OP4Z3h6*ul_p=Kni21R0GsN2;RoFHR2gQ3r@;F89SKZ>(H>B8H)`OTi zF-l8#hFhX&Jig!T&5b@lBU?hWu4BW8lF=eg@CbWYCT9~m<+L4xw}_M@jiWkDNnpD9 zA&iN*fj!i35Nm=Z?JWVdc>7FyZwn)715udr*KY%{qwQ^kV_UX^71CP1&|>f!z!=ho zVk3743b3IDgxH``rp)Strp z(X?&_rX)E=m4z_TFdB+BjCuyb6*=|7NrKmVqcuAFVd*7rao=w zkKt!k4hJMakOeZy=(l@k@p*J2nl-Q-uoRGkle30{8NWf1#{1pRN>IUgHv%0o1Jhw} zaJ&1coFx!6+A0ywX!QwDF)L-zpxQ#0!(^nx8-GNx==P!lqMWt6d7VVxvg|%q3|-?O zb;Fng4$pzT#Da;%Y0%|gYU+=R@6Os%<05Q)(mM^ z_yVjZJFZ{r4C?I^tE}x_R2)ParPRvl2gw_-Pg0LtC z@)4jG0R0IL2oO#kS?j!v_0?F2N}S1IWmk{Y*=TISb6>-tV~&%Von{=cj{&vro5Ox;Z?INDK~xQffk;(F za973xp;rhNEHOa085A^D-J^wX1LD->DBObJ5fMn!#bl|;E3{aCv~ zqhuy-RLRpnFbF!9{!sZ4>E$1wN=ERyR5S%t?4bFqiyO=4Dk{zec|fheV>A04_Z-cW zIyGhV)+lLa7mVxVg+Amk({Ju97cOI2M!@)mZz+Kwmmt8UV(LDd+bTZ>mhyU2l_J(& zt&QY@3Kyb+`amdP<{v3pkXT~0A4N<#eF~F#618k$U%h;kJb?plg3BPHo}8a?0m_zz z&9rMllNL1PGypS&<|@q%I4-z?d6Hz}yx32=Slf#!NO4prDeJ&Jn9e@Z-@9InFH#=h z_JQIZK1=KLKE-!53~tJo!2uA~k+-JSl{Qk4s$ZHu>QxGceVRFXM~ZB``DVHDFm1ftV1v!#L`vi2oz?l^G>vknTy;^-4S$zudE zX7(rx^*UZ~r!!anV17cjntr%m$Ey`c5a&UP=Ix#wLAymJ0-x4uSbV_~y zN|FPiDawF0_He6Q2d#r4OySa6-sn@ef->`K%l-6UmNiJJa=GG?KwIm5N;Jp8&V?ZT z%65z>U{Q47NoaWf|RAXaC{p(rA{P@bQ=P z?#M=+$a72OIw#O*|FvO_l8~|KdeX5B23hT{L=G-%;^2f+efRn{_ z7pHrlwR3UdrY}JbNXj>e^zVh_0kbzth6iR~Pz-qEzmF3QE_j*)!&Ye5wz`o=46>rS p3aM2xvd3A<9#jvW1U3*LOh5Ta74f1*V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#FeGmDhCI8!oyz* zwO21Q-LubV7h2HDVlWs2&VX$s5R1G7$MEc!5SxGrw!w+vh2;1+GI=jC%Zq)$b`HkR zoM*?xv1N-zl39e1{16gCVv$BjgO-`mti4QcRb5@n`=h#BGeR@nGcEhP1ANcvGqwDd zs(b6+-}iTa%LrSxY+*XM>86{!zP>&HX3m_+V~;&1Osk-2;Kmzo^z!0TRQC`7mbj2# zK7Q{Xt$u(+CF-b@YZCys^Ru*xBCB zBb}Yz(Hm~?PL*de2$d{g?b@~8HP>82Hk;*~bI#$8JMJKx&2q~vx3GEhW&p0Z;tGEF z!ygg~h4{CB`#1LN*+VE4V#9_FtY5#rrZ2PemIu7W4HtlQgr=6coPFM9n5NB3&pw6` zdl7&@)1Pwb$8SQ{W%j=M0TMG=-)v>6qjw_ce!Oi7( z==IlmqP`x0>r*MdcGg*l!646cb#XAArahfzJ#cRY%a~LFCE@Sew~yzZdyZ^2OXx$nv|5*S1|E^&xa! z=82!&P4k@9H7TJa{GEXS|9a6yxVaogJPv?xiud;l1po92{iDiWQ_%sYxHWq=1zxSCUL7 zx$wdZYqEe(UHX@p*#Y`TBwAZrG0Z~6`U9H4?3oeLS&yIp?tj%}0pDA;jANch-JwIY zx3pmAa+Br}L=iU}Ca`cJaxBId_U@h30^~{$v48)548vf}nl&^vHKD31+qP{R_tn?c z)zRJE&BYgAOiN1(0Nb~3XK-*3S*}>cq==35ccX-UOU84+^(r^fZowjY{#MDl1m5+0-mmu*}WTC*UM?da2TVvm+-mg zqP4fqAjhjP7o%=4Qg5`V^6`ewD(|5c!Q8DZKR-%JSvZ z?b?O@;)`USeHQoVQG$v>IufBUGBRoTReheVt*s0W4gxSZILQ3@^NGjfq|<2thKGk) zuwVg-qR`jZMqYd3w4AZJviaJdBaaU_JUMp(mfj$mI}HDLla1z8&GJt4OOV zg@FNtcpRm%5p{I5;`>+aAKKd5a9tN!mg(u~!FBxxF_+5`3u*?Y+P;F1Hgu1%AQ$MtAvu@qGsT4IW=(;-Ly_dH?J>~MI`u=h-c*^Sq;8%P1 zPMB{(1?-AOx#pT{m^*ha;QRTp&~?3R1*&n992V zzT21|Ttuj@4S;MmJMO-wO5`mEfM7sJ6n!PQo`@*QG)7e%r@*bBxrf8KgHx^_U@b7K z*x|}$GUM)vnucqd#rgvXf`A+hq7({ffZWo8?KnJf`Q@yiq>c&Ofc5Lw3v1V|^%g8x zz~z@;&fwr6*=&|fCPOe7#57HGT}Ko}Y}>{#3!=eD6?kGnpQtx z%Mb4qI&XQvyMPD_&X`Z%utYweN0JpZ#TUM&N(h30=lL#45(T35I+`jle@+9#vBNy_ z%YUAh@4t7;7GYgyr&rh5$ovHh2pu>;!8EZ&5lPc<^La!~^XqqAoO~WZ6j7R*AP^wD zbSdV*0M|eNd~N-J?(S}8&z{XW=bVG8s)WN~=FOWoVfsWOfo-gWbW)194~;X$}E`Iz{Te^BOvhB!36VX)p58t&A?EORK~(_JodhEkfG!6)Legh za1g<^k`Vr|r3J?{$tM!Nl5Crm(I`~t2UNv^LZOhKcnk~5WHRM8 zAR3L5&1P|3pC*RGVH8E7t*vdk?>!E|VyAOF3o4Y`fKWieG%Y;OLzevZL6Q{e!lxz% zQ-xEEdX8m5wrQ5z0684SHViz^!`3t;T}PHA>Wgxl3{|n9lN&(rEu&-sBPVIObYAKU zOqEfbjGX!IYxQBhYymlAe1g*X$=9cXvCk}>BL1aDqh$-o8OBNV8^z}~-&NMhm^KR< z+ZSkVZYC0mOvr+!(-Eu0f`D->C>T^HWI@v%oSBRT;d$d&kP-?_$bu%rgbG-{e!Z|^ z!v^B$?~NRH+x zxB{9gvE#L2(&;qYclLk>p6AihTt_aO!f_QmJRDb|v3UlZ1{M^EMls`Yg4rytt|M;V zOgf!L+O!G5^YA>6Kzlo*hC#rxZ~@8lm=lSh76)x6Le;S#UDq*-J}(xFjf?Z^x=tdI zC|?^K9KFujhz~JCu+2=PkH35|4{J~(bOgBsSIyySa z4RXm!YQbnKiy~$zxFPE50>!I-{hBHf4EZ#%bT1UDL)U7vys&<#Oc_v68z927_$dwvE2NK4#9G$;~(4 z%$8}6f|YRPwKsXQm)#6NOG_IaGiIYG3WY*}f@R>i0(!ASq$mo^;Jfn*8tD-2M|NQ3xc=XXn0qE@P#C2T`95_HnM+ebp zlw2;yE3dqQWm)C)(-{Xi71|ek3V@L#zhdwmiS}75IDW_@o$MhPYD89oI8K4#frAJX zXq|s80P()9r=|Ye06dR}Wf{4zk3EqH-r>V^TNW*|FBRF*Wa9uO zRLv2uzWQn&fBf;XOX)1eHx3*)05IB82H50r%rj5{8SCx87T;p$I* z*=w11&1tRw?yfE#eBp(1onw#3;=vbQ5WardW!}wImRl7Idi?Rnt1PazJQHE~$kbig zbn;AuM}?`kFi=Se zlPaJjeA~A8=$~GXWtpT>{%Dshy}SLk9h>_4W>i&Y^Tr<&u4}AG2_@mbE{fdy@sHye z2DxIGLp(*0&$VrW(I`?Nz~BD%w_K|0H7TJa{9QBQ2g`lI7hfOo6rm>9g8F7(5r4lK z=2KY-6)oV#|Mq2X@#6Cl1c7*b002D@MifMHxm5XlEJC3Ou4A)n=SDVc_*G3`;Lktz zIqwT+o{1w#sJ*=ah@lW^SteABy@)4`z2+Mm5pA3Qv112!J@ZU$>jS>r>3uB#ZU87U zOEC)Me1VtGix5??n?N++k-e2IU{V&eX3bh}@#6Ez=M8##4xnki-#3j+S@@;%(l2jj z$>mZsG%whSSAhEJnd`m~qiX zge3_yjr5*92xGo_DHtT*+e`TDvkA1eB1EGc*|7tux3~I^&ICA;0n3CXtDw<>qrdgq3@7cG>^c6KEiHwtI)o^3b9y$n}FOg$Q%GW3nM39pADUz-b8J|lw71F`(v)I z>ryD>Q4|eD(J=ElNS#RI6$fiYNk$L^F8-6XY~S|lslGD+o9@1w%kRD$QB|4sjc+jH zqaU3#{qe1S1k}mp==;e}kbr;r=tsG8>(nEodw~nboV$_YUk}3PeU#Xmzo-886&(NW zo4BzPX)HhmN(;p9`3U^^%W$gb)ae;9$ETvEk$Km3&+~ZWjhCie-dOgs|DlJ7G&a)q z=}(j1z8#vH5L_2e6scRXB9O~m5^T)E~; zJoD7QPxbu(xFQgsqcr_5lVR|`{)^H2dVhJ8=ON^Bcttj(27~@I_5OZTS;lT@!Rqhl zk+o~Nb$vCF`SI9LT%WEnveaXb$}*9k9L#J~$L@K1*i*VGd} zdoe6K6VzQm0m31WRd5SMK?}Z1l2!lM_CO3l`%0BJpSJkl{gZdbD!QOV!k=u_(Xqf^ zq^GFNnY)aSU;ZHkL16c5hgiIL7H_}Z%kksK$z+naj?Mo4JBY{nr}N(9kQo}n1Ed8D z2wN7Cu2Z*oG2zZm1VJFPcQ1j33o#BI!s_j%kV@g%Hb-~u;&6pYQI)V4nEy7IqYzyI z;W(&uQ1_7*vY)*XQ3SR&;Bg;ta zIF4PQuC9T7Z*JqYSAU11__nucV}?ki1G zEXYduZU{gPftB&EyAiNFP!))VPhH+vRHXpJc=y!sP$*Ki05d;+|Af-{$=9cXu`EbD zd1^QyH8z$lz&h!E>D($RsFrvT_!e+7)CS5HkjtMs-$d8Pl|9joQ?a0vQMLdrh#m-| z2g10HjetNj(v0iaT)E~;(+F@XPGhluaO?W@(_%sQZrLIn1`f>!b#>9r}cJ z1#`~w-Q_no{Q+3ex#wO)EI!IbA6d@ZZ}*nd{;^n4{YO567mpLX-~x<8C$=s-nFaM0 zr%+B86R{xq&(0#y(@*A_YmxSx=;ZyuSWr0JNIIRswk;Gzd)HN+K!7)wjP>A%_tz=Uvr01S1&(GI7 zI!NbosE&i@c_@Ow$L_tC|NPs(t*QQ2Alw3(L69?kV;lZIuhWwPe(|W^53rzq4!mQ4 zngbUQ9hegVDlAj0Iv8i$7P9P{m0@PffjNL+unseyD+}K=Gv!ISwT=e>toY&=31_p6 z7TbfYX(9>2xcT`x(?l)K$v1O3=3I9jlBS)uSW7em$s(&s86X!KL zC>qJ+5YcEWrdj0Rg5Vzu0@JMO4D8cHt5z90SQv^+xzq5_!# z2)9EL|Le8KC?Hqtc<1uK=~TeTi0{Y4VZTRW=5x5NGfok@7Q`fnU9ifEl4bd{SirCD zyN@$lTUmVLjig_E5jr}+brEHm(87h~bfswM;UE8)eepOmq2>`WfHwzW1wac#3%St>pEq3Bg-lS z1MgtlHnJ?!wf_}1Z?0`t!ry%26W-T~E7jYYo0&0V2C|}H7YZ1K0+MZ`76GFHV}?H-Y~>;6`ijttU%RS7*I_sohB+Dd@*uUZ4^R}1 zfq^6CZ3@62qHJj?t&UNUWtHLK9vr8D<2ZC5daazdR0dU#C~u>^sCKYX~Hw^o$a2k08yJqX8J;6uF-T>unajjBPi8@9E96@~8} zIgz&#s&YY1%`*Xr#|MbT`e|zFC=S*q2?XnqLH0;n;bO^nslA8C}O!T2NDVLqR5{Y8|BT$=~*jw8$cc&ZU^~IIDanC z4~HCR4MTk#%n-c!CYTNISH;fSXN$33shp<$ZR7EySjaZ|wDjTsj|nJQfdZ+9KS!s?+<+D$A{^ACQPo zJ)|(5JQLv;6?UsVU3n(LkEhX;Rhwtp>jOUB`G}{r`*D!`z=!#-Ew@f@d*aT{Y1RK; zK~)xTUFW(ong8YuN4>Ga2hiGg^6Ab;yl>uc)H_w44=^z*TEKOk>%0cmqSOu0Sht9? zmt2XNbJ_O#LzwkX0HCL?=aRF&h8`5z+w~0b^g#;gb`q@TH(MtE&lc}@3z$>^CE?qF zom_R%zhdTGlJVju9Ll@pY8O1BjREwa$bUZnS46m?q7pt(Km`l<%WHq>t(^50B-v)@ znBTGl!UB>uN+wocJ}(z2KwV=VyCAW3-#7X7mdQ6udcP}R(l+3_&UN0(SzjUV9iw}H z8a?Qp2{-Z9M5+oE!FXa7=s(Qk**G6L4#mX4` z`caFQo(y5+46-SIbM`&kExvk{fTE@u87Pp73)D9%WJmoGw2~XD#E9OHs5%r;S0BXA zdkBI=Y{90f!2K)(9dQiqKD2Qk@w#Yb+&7WWX1c|C542`lfSYGQF-kcX9b5JiD#lY$n2GnR%K9x(Zj z=db^u@tp(}8{y%>G_ox)=L`wQtVh!&7A_BP@s$dKAn?}CJoA^R9PY9>e#9Z2v~g_M zv+D>$$wQTjf8V3>m@uv6QWAs5MC`mtq)}tn)->BTI%vA@!Lk{frWT#N=`fneqv;Zs z9iTP3l7Z7RD*2v8RV*l2U)%+D91F6`Z9ph2V;Z)bOtU_EN% zL6&^jM$;AYW&zXi-OyMTq|nqRv1qwJPxJ#8G&!cl zg3j;MNe&B~d#S?Vt`qyVe87UHj;dHtBpP5eZc@kw(R7!WH;bgxX|`>W!1LD$x3mYy z8l$*Y01p?(lW2_0VK8?3b}@f1qUu;sA=`)&@>i=FW(HgpyyE(Rh=pNhaV>w2X3j|A zIR309;q>i>@Sa3f3K&fqD4{roY$J7%;ukIYu1C{FLIL03m+plE(enQJUd8>x-`|*0 zG*r_?Mg~m+dI(W=iX~WN4S!ugdem1+-a37gqTcJMN&y40w-`+txRT$kHOwroEz#Vj zmlYAvL&#bIR~kXlZQ>dKpWA$30h41=1^i~qy+SYFLZ*?CSU;mlgZc)UfF45AbidKH zB@`)yW!VJu5Ti+hc=mN9doFuow|qcBE1+TvsWO9JzJ(}g5W5FK??X1uqhodmtPn_` zsxtjOS?s{?aTJTU2JbKD{Q#4rDvHv^ZQ#L({4hg(GHsDP^dI&}TipcJ7G$9w+szY; zzX_5_i}xjf55@tiK-C;^$>%cJoUnZ0<2}tWncG} zEL}v`{?ogE|9cfxE8wNByNg2hG4^;Yo_gUyVa;V<_gbiS2mSXqs$xOI!lP3zcshCB akNAJgJ3L5TS`gC!0000pHgPl)S*0|y!y8Wqc|C6c_5fMd2 zMXOe=`tQwRynjD$UY_)nDgR|yjxwYy=HZz&bEboX!+)Tx0mGN~2j6}C05q-jpkeF8 z_TBZOo-U3d6?5L+$XtEMK%n(uhWU2AcfbDsUr|(iJMK`g=FDR(wex?y^?B%!cp&iA zX`Pmx)eae&XYMjHMV>d7S37hixH9mc-Og}3zZ;)CwX%cORJB6bf3IC@oBh`BcHW*( zg@>m3zY4!CWtMwATe|=M(pkBeS)RX_z=a;R?ATdu@KbLh*2~7ZpslhG) delta 407 zcmV;I0cif?1nC5jBx71oOjJd{z`%e2fB*mh_bWv zGrzwLZf^e^1jPVkybccaMn?aipVHCMqYMn1nVCR9Kv-BaaQ^zXs$ z@$kUFz}>Q7qmh2Qe-cSVK~#90?bz*ZfmgG3L#DD06v0X`;;K0fo;8&-^(Nrk?rAp2sWiOlWFMok`a6$~zO9e&5c9 zv!92VSKdyz@j@!S@>kmXR= z4zVi%0DvCS+C*Hd2m|8t!g}s_I;wJMKzu&s-(nMbJ*PLydM>0f)^kCPu$~KQjP)D< z00000cxxwRDQ?cH7ytkO0000000000004kjZ~-Yq5wkj;YNh}H002ovPDHLkV1h?1 B%YFa= diff --git a/icons/obj/items/storage/backpack/backpack.dmi b/icons/obj/items/storage/backpack/backpack.dmi index 959b3bd4074620f184294d23273225f52ceec5e7..9b38d461f2c69422a3ab6c82d870cdbf8eb766fc 100644 GIT binary patch delta 865 zcmV-n1D^cT2d)SqiBL{Q4GJ0x0000DNk~Le0001>0001h2m=5B0K2`CDUl&q0hN(@ zh<~zm;&ZFAf~%hkIOqU+DPnJ}O+_{U00RF>L_t(|ob8(plcOLEhSfVZMulDd|3CH! zwI51Alw!TRJTqH%`ZDotz}g{DRe~T0!c6_-(^gpO=GUF(_ovM;)T()+*c^VXT1E$e zkPhI)Z2}!@rS2(g6l?ISo&RZh2VYPDB7fRfPPbCmCs?#y`i`P_1_yP|p;7~z!B)FQ zx12~ipfLu4)2)O(U3J5u>(blKUcXvdhcg2|#O=3hzC#9`Kf}a!QrABmY#6MnzVo8g zWN^4a204dY83Zuk{(Pmwd32$R8|-eq0I*wzu~U$&x%^Sf8r;mFn}ciy0ehFh?SDB) zFMW^ek7;jW${fu=+w!;ZW(H$JjNKlC-fd!&)==i0!GR18Z#HF5!&EDJ(mkKWb`J7ig@2#oW^nN^zMjFwv-oNT=|QsOdcO%57O!WIxcV<@ zK@bE%5ClOG1VIpPjLC1lC-m<40DgCPk3lYUMefqdP;(GO&ko?28X@*kxX{E1Ty-fJ z#9s-A$(Ym>My|w#jthal>)tRSq#BG|i3=SU*eFyiTGfkS8j}sOwWe_BxPQP#p@I<{ z&mdoG3Wkmgd=zeo(=%9nh;Q|nWg$gRU@+Zau#&=rjtguQ?U!TRd#OXrmU4oj<3cEo z-!;7u6Ya=_jthby2!bH|H{|UEZo{o_`HK%lj7bd@}YQE`gDs2OEoc$qR_tjK)j{7V!YfSz0n0 zK*r(53J=L;eLb)SN6uh;5s$R8z8(ZK7+u68xvZ}Tp$uMUh|$2bdl65cY4FG*9?4~W zy-50h5t> zh=05~l@(n5T);s90COHt%wU^Zr~m*0rb$FWRCt{2n(3CCFbstWts?~3Q+WS}t(PnX zt`{J|{h@nK#yL?&`j8a|X{KpJB9Z8&+go+wx4)ihf7ghw+P4(U!F{y?I}yd~MBbPH zP|p;!3Ig1_$CD06xKl&SY=0uVHT6RZ;eR%&XAYDaVFo(w7u_MFvlAO*n2_C?cyQ69 z1UF>~9vbl$bU%Lii2?ZdjsTkaAv}x4cK~CM13(113=kRekFBNWNA{_Y0Vo$fT)$f( zKsE!u24Dt=2cLn&4z%vdT?N<`e+;r2NNoZ4NdSA%t-Ep$Fgk$o!vN13h{U&-Z-0wl z`A?x;Ek(N}$N}gFfQF_#z`ue3dbMusnw>NP(3}PsHvs4;=ioNF)-8ME{R+jr{k+ z4?Uyq=A!uSF)-|}E(2(qp|3{Jhkq{Kw$ptj0v~o5xLO?sfSP3(0P0oY3n10ZUH|~Q z{FkQU7Z1ud^RY3Am#xrEIQk?&Mr2EL9gcV^t(w!QZWy($QJRe@^?SCy!!T^=g=VHw z06a(A1K@_Ct9dBRQ!xOXrS1Z715rAj0X$3H1%S4oJOihTs6V&>r4UspWcOnvrL?V$$Boc`#sQ4cM zz9r(?@r|hqV0-tv09<(ws&9d=4q)5&ssQqr{W|&!l8GVzS;RkL00000NkvXXu0mjf D+^t(u diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 01878c15e8df754cc619284e1dc5c34ee41ffdf8..7414e05bb1482622441a75a2d1ffd095b25377a2 100644 GIT binary patch literal 15156 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∨N5#=#vJ za!v;?+uQi7-QG>fN%>n29UH{w0xyx^zAL&FeNX**G?pefmxXQ$^!b(xlsCUWX%I`h zL=8t4A{HC6LUGYwzJHM-WHy18j3>BFR;a;OM!pAYy=0lCR&VpN@@(WUl{-6%%jj>@ z#sHWng@S1w!6p*-`z%?;4)T8)XwGs(9T<6$+WGFPcxI)-3g3>uDhMU0k?x(gCB19-J2m)lt2ahVyT_3-V6&1j5zzI&97;q-df&%AR6zH5QH{EEA}AlUBdDg#F-l z)5<1cA*{01pffYJgE5j^n^7u{Lij?G6@ZN3FJFN=r>K}dCc~&rE%Q3}BNtk?H{gvy zN*dnqrOq&q)!vV$^ce1}0*vEUX7jLi9;+Mp&L~qAD>oiXMaD;Bow< z9QdkARM+&MPVqn?!ZM`uo;)t-)wr`rIxcLb`{@7WE)o zXPFQ=w6U;oBHY3vIaInf%tZlM6=*~-sE{kd=TGXZ$G??P$PGd+P^qG{8+h62uV?PFTzoKYE+L4&WK zi5d2)eofW8H=`WLOHc!4Pa7Fe7x&0~X zrkc(88fxE!03E1u>IixBQ68o%vVF3$^eh8sFDVc>5}p%p#-=jhgr){=X3q$PcT-k0 zye*Q+w6!AhBfrt?wPl((brQ09rXz=7f60>Tpq8Q3E|VL~CIZxTUGb=HS){60BRo^z zv8}D0uJ?kkyO$w=GK-fPsc!oCg#sJ6@VCt}9p7mUp&=xNTApIccM^(v#4r|3ho7Zz zXk2*V1PCutz#9=zY@p6)a3j!Fw<`;mk-7xL($bQere-MAWsg_wI5i;RB}?i)WKQyL zot&mr#Wf~6oUo-ZVMm8eao4fJoz7V+zIaJCi3;mt4RVE{heO?G>FV~{h?)>4(@c6D zdv7&+{??(O`nVj>?o>vy$4rERmv=)A?D_Nh@-EbG-HsipdTK{X~BG0B<3%sGu5co z!JLg-+Bl?}dkCkQm(Dzb>*bV7$jPs%9YclDCow9qVj93@C>X-enJS~s&sQqK&-QXe zDI!?ihlU1;b&~@l?aF$|T2I0V<;3L@z#;!B~YuV$#nb`l!$|}OE39e+7FH#hWU)|Nn(h&|F3z&|1p{P{{#3*EHqVPb4{lh2mTrsAT6#SRwrT< G@_zw6m)6<< delta 14784 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 From bd40ea77f01ad0db7e2558833cdb97fa8626f472 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Sun, 26 Jan 2025 12:28:52 +1100 Subject: [PATCH 023/133] Splitting Bayliens back into individual modpacks. --- maps/exodus/exodus.dm | 6 +- maps/ministation/ministation.dm | 6 +- maps/modpack_testing/modpack_testing.dm | 6 +- maps/tradeship/tradeship.dm | 6 +- mods/species/adherent/_adherent.dm | 31 +++++++++ mods/species/adherent/_adherent.dme | 15 +++++ .../{bayliens => }/adherent/datum/culture.dm | 0 .../{bayliens => }/adherent/datum/emotes.dm | 4 +- .../{bayliens => }/adherent/datum/faction.dm | 0 .../{bayliens => }/adherent/datum/language.dm | 0 .../{bayliens => }/adherent/datum/location.dm | 0 .../{bayliens => }/adherent/datum/species.dm | 2 +- .../adherent/datum/species_bodytypes.dm | 24 +++---- .../{bayliens => }/adherent/icons/actions.dmi | Bin .../adherent/icons/blood_overlays.dmi | Bin .../adherent/icons/body_amethyst.dmi | Bin .../adherent/icons/body_emerald.dmi | Bin .../adherent/icons/body_jet.dmi | Bin .../adherent/icons/body_quartz.dmi | Bin .../adherent/icons/body_ruby.dmi | Bin .../adherent/icons/body_sapphire.dmi | Bin .../adherent/icons/body_topaz.dmi | Bin .../adherent/icons/body_turquoise.dmi | Bin .../adherent/icons/damage_overlay.dmi | Bin .../{bayliens => }/adherent/icons/eyes.dmi | Bin .../{bayliens => }/adherent/icons/organs.dmi | Bin .../adherent/icons/template.dmi | Bin .../adherent/organs/organs_external.dm | 0 .../adherent/organs/organs_internal.dm | 12 ++-- .../{bayliens => }/adherent/sound/chime.ogg | Bin .../{bayliens => }/adherent/sound/ding.ogg | Bin mods/species/bayliens/_bayliens.dm | 40 ----------- mods/species/bayliens/_bayliens.dme | 63 ------------------ mods/species/bayliens/_overrides.dm | 7 -- mods/species/bayliens/adherent/_adherent.dm | 8 --- mods/species/bayliens/skrell/_skrell.dm | 4 -- mods/species/bayliens/tajaran/_tajaran.dm | 9 --- mods/species/bayliens/tajaran/datum/blood.dm | 58 ---------------- .../bayliens/tajaran/machinery/suit_cycler.dm | 52 --------------- mods/species/bayliens/tritonian/_tritonian.dm | 1 - mods/species/bayliens/unathi/_lizard.dm | 5 -- mods/species/skrell/_skrell.dm | 16 +++++ mods/species/skrell/_skrell.dme | 30 +++++++++ .../{bayliens => }/skrell/datum/accessory.dm | 2 +- .../{bayliens => }/skrell/datum/blood.dm | 0 .../{bayliens => }/skrell/datum/culture.dm | 0 .../{bayliens => }/skrell/datum/descriptor.dm | 0 .../{bayliens => }/skrell/datum/emotes.dm | 2 +- .../{bayliens => }/skrell/datum/faction.dm | 0 .../{bayliens => }/skrell/datum/language.dm | 4 +- .../{bayliens => }/skrell/datum/location.dm | 0 .../skrell/datum/pronouns_skrell.dm | 0 .../{bayliens => }/skrell/datum/religion.dm | 0 .../skrell/datum/skrell_meat.dm | 0 .../{bayliens => }/skrell/datum/species.dm | 4 +- .../skrell/datum/species_bodytype.dm | 4 +- .../{bayliens => }/skrell/gear/ammo.dm | 2 +- .../{bayliens => }/skrell/gear/clustertool.dm | 2 +- .../skrell/gear/fabrication_designs.dm | 0 .../{bayliens => }/skrell/gear/gear.dm | 10 +-- .../{bayliens => }/skrell/gear/gear_ears.dm | 18 ++--- .../{bayliens => }/skrell/gear/gear_head.dm | 6 +- .../{bayliens => }/skrell/gear/gear_mask.dm | 2 +- .../{bayliens => }/skrell/gear/gear_rig.dm | 58 ++++++++-------- .../{bayliens => }/skrell/gear/gear_suit.dm | 4 +- .../{bayliens => }/skrell/gear/gear_under.dm | 2 +- .../{bayliens => }/skrell/icons/body/body.dmi | Bin .../{bayliens => }/skrell/icons/body/eyes.dmi | Bin .../{bayliens => }/skrell/icons/body/hair.dmi | Bin .../skrell/icons/body/organs.dmi | Bin .../skrell/icons/body/preview.dmi | Bin .../clothing/accessories/obj_skrell_badge.dmi | Bin .../clothing/accessories/obj_skrell_blank.dmi | Bin .../clothing/accessories/obj_skrell_vuxix.dmi | Bin .../accessories/obj_skrell_zuumqix.dmi | Bin .../skrell/icons/clothing/ears/band.dmi | Bin .../icons/clothing/ears/chains_long.dmi | Bin .../icons/clothing/ears/chains_short.dmi | Bin .../icons/clothing/ears/chains_very_long.dmi | Bin .../icons/clothing/ears/chains_very_short.dmi | Bin .../skrell/icons/clothing/ears/cloth_long.dmi | Bin .../icons/clothing/ears/cloth_short.dmi | Bin .../icons/clothing/head/helmet_skrell.dmi | Bin .../clothing/head/skrell_helmet_black.dmi | Bin .../clothing/head/skrell_helmet_white.dmi | Bin .../skrell/icons/clothing/mask/gill_cover.dmi | Bin .../icons/clothing/suit/skrell_suit_black.dmi | Bin .../icons/clothing/suit/skrell_suit_white.dmi | Bin .../icons/clothing/under/skrell_uniform.dmi | Bin .../skrell/icons/gear/ammo_unused.dmi | Bin .../skrell/icons/gear/e_shield.dmi | Bin .../{bayliens => }/skrell/icons/gear/gear.dmi | Bin .../skrell/icons/gear/gear_rig.dmi | Bin .../skrell/icons/gear/skrell_carbine.dmi | Bin .../skrell/icons/gear/skrell_pistol.dmi | Bin .../skrell/icons/gear/skrell_rifle.dmi | Bin .../skrell/icons/rigs/combat/boots.dmi | Bin .../skrell/icons/rigs/combat/chest.dmi | Bin .../skrell/icons/rigs/combat/gloves.dmi | Bin .../skrell/icons/rigs/combat/helmet.dmi | Bin .../skrell/icons/rigs/combat/rig.dmi | Bin .../skrell/icons/rigs/command/boots.dmi | Bin .../skrell/icons/rigs/command/chest.dmi | Bin .../skrell/icons/rigs/command/gloves.dmi | Bin .../skrell/icons/rigs/command/helmet.dmi | Bin .../skrell/icons/rigs/command/rig.dmi | Bin .../skrell/icons/rigs/engineering/boots.dmi | Bin .../skrell/icons/rigs/engineering/chest.dmi | Bin .../skrell/icons/rigs/engineering/gloves.dmi | Bin .../skrell/icons/rigs/engineering/helmet.dmi | Bin .../skrell/icons/rigs/engineering/rig.dmi | Bin .../skrell/icons/rigs/medical/boots.dmi | Bin .../skrell/icons/rigs/medical/chest.dmi | Bin .../skrell/icons/rigs/medical/gloves.dmi | Bin .../skrell/icons/rigs/medical/helmet.dmi | Bin .../skrell/icons/rigs/medical/rig.dmi | Bin .../skrell/icons/rigs/standard/boots.dmi | Bin .../skrell/icons/rigs/standard/chest.dmi | Bin .../skrell/icons/rigs/standard/gloves.dmi | Bin .../skrell/icons/rigs/standard/helmet.dmi | Bin .../skrell/icons/rigs/standard/rig.dmi | Bin .../skrell/icons/turf/skrellturf.dmi | Bin .../skrell/names/first_name_skrell.txt | 0 .../skrell/names/last_name_skrell.txt | 0 .../{bayliens => }/skrell/sound/accessory.ogg | Bin .../skrell/sound/drop/accessory.ogg | Bin .../skrell/sound/pickup/accessory.ogg | Bin .../{bayliens => }/skrell/sound/warble.ogg | Bin .../{bayliens => }/skrell/turfs/flooring.dm | 4 +- mods/species/tajaran/_tajaran.dm | 24 +++++++ mods/species/tajaran/_tajaran.dme | 14 ++++ .../{bayliens => }/tajaran/datum/accessory.dm | 12 ++-- mods/species/tajaran/datum/blood.dm | 58 ++++++++++++++++ .../{bayliens => }/tajaran/datum/culture.dm | 0 .../{bayliens => }/tajaran/datum/emotes.dm | 4 +- .../{bayliens => }/tajaran/datum/language.dm | 2 +- .../{bayliens => }/tajaran/datum/species.dm | 24 +++---- .../tajaran/datum/species_bodytypes.dm | 28 ++++---- .../{bayliens => }/tajaran/icons/body.dmi | Bin .../tajaran/icons/clothing/atmos/suit.dmi | Bin .../tajaran/icons/clothing/atmos_alt/suit.dmi | Bin .../icons/clothing/deathsquad/suit.dmi | Bin .../icons/clothing/engineering/suit.dmi | Bin .../icons/clothing/engineering_alt/suit.dmi | Bin .../icons/clothing/excavation/suit.dmi | Bin .../tajaran/icons/clothing/medical/suit.dmi | Bin .../icons/clothing/medical_alt/suit.dmi | Bin .../tajaran/icons/clothing/merc/suit.dmi | Bin .../tajaran/icons/clothing/mining/suit.dmi | Bin .../icons/clothing/mining_alt/suit.dmi | Bin .../tajaran/icons/clothing/nasa/suit.dmi | Bin .../tajaran/icons/clothing/pilot/suit.dmi | Bin .../tajaran/icons/clothing/salvage/suit.dmi | Bin .../tajaran/icons/clothing/sec/suit.dmi | Bin .../tajaran/icons/clothing/sec_alt/suit.dmi | Bin .../tajaran/icons/clothing/wizard/suit.dmi | Bin .../tajaran/icons/cosmetics.dmi | Bin .../tajaran/icons/deformed_body.dmi | Bin .../{bayliens => }/tajaran/icons/eyes.dmi | Bin .../{bayliens => }/tajaran/icons/facial.dmi | Bin .../{bayliens => }/tajaran/icons/hair.dmi | Bin .../{bayliens => }/tajaran/icons/markings.dmi | Bin .../tajaran/icons/markings_old.dmi | Bin .../{bayliens => }/tajaran/icons/organs.dmi | Bin .../{bayliens => }/tajaran/icons/skeleton.dmi | Bin .../{bayliens => }/tajaran/icons/tail.dmi | Bin .../{bayliens => }/tajaran/icons/template.dmi | Bin mods/species/tajaran/machinery/suit_cycler.dm | 52 +++++++++++++++ .../{bayliens => }/tajaran/sound/cat_purr.ogg | Bin .../tajaran/sound/cat_purr_long.ogg | Bin mods/species/tritonian/_tritonian.dm | 4 ++ mods/species/tritonian/_tritonian.dme | 8 +++ .../{bayliens => }/tritonian/datum/species.dm | 0 .../tritonian/datum/species_bodytypes.dm | 4 +- .../tritonian/icons/body_female.dmi | Bin .../tritonian/icons/body_male.dmi | Bin .../tritonian/icons/tritonian_preview.dmi | Bin mods/species/unathi/_unathi.dm | 18 +++++ mods/species/unathi/_unathi.dme | 14 ++++ .../{bayliens => }/unathi/datum/autohiss.dm | 0 .../{bayliens => }/unathi/datum/blood.dm | 0 .../{bayliens => }/unathi/datum/culture.dm | 4 +- .../{bayliens => }/unathi/datum/language.dm | 2 +- .../{bayliens => }/unathi/datum/species.dm | 18 ++--- .../unathi/datum/species_bodytypes.dm | 36 +++++----- .../unathi/datum/sprite_accessory.dm | 50 +++++++------- .../unathi/icons/body_female.dmi | Bin .../{bayliens => }/unathi/icons/body_male.dmi | Bin .../{bayliens => }/unathi/icons/cosmetics.dmi | Bin .../unathi/icons/deformed_body_female.dmi | Bin .../unathi/icons/deformed_body_male.dmi | Bin .../{bayliens => }/unathi/icons/eyes.dmi | Bin .../unathi/icons/footprints.dmi | Bin .../{bayliens => }/unathi/icons/frills.dmi | Bin .../{bayliens => }/unathi/icons/horns.dmi | Bin .../{bayliens => }/unathi/icons/husk.dmi | Bin .../{bayliens => }/unathi/icons/organs.dmi | Bin .../{bayliens => }/unathi/icons/tail.dmi | Bin .../unathi/organs/organs_internal.dm | 6 +- .../unathi/sound/lizard_breathing.ogg | Bin 200 files changed, 482 insertions(+), 429 deletions(-) create mode 100644 mods/species/adherent/_adherent.dm create mode 100644 mods/species/adherent/_adherent.dme rename mods/species/{bayliens => }/adherent/datum/culture.dm (100%) rename mods/species/{bayliens => }/adherent/datum/emotes.dm (70%) rename mods/species/{bayliens => }/adherent/datum/faction.dm (100%) rename mods/species/{bayliens => }/adherent/datum/language.dm (100%) rename mods/species/{bayliens => }/adherent/datum/location.dm (100%) rename mods/species/{bayliens => }/adherent/datum/species.dm (98%) rename mods/species/{bayliens => }/adherent/datum/species_bodytypes.dm (82%) rename mods/species/{bayliens => }/adherent/icons/actions.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/blood_overlays.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_amethyst.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_emerald.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_jet.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_quartz.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_ruby.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_sapphire.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_topaz.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/body_turquoise.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/damage_overlay.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/eyes.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/organs.dmi (100%) rename mods/species/{bayliens => }/adherent/icons/template.dmi (100%) rename mods/species/{bayliens => }/adherent/organs/organs_external.dm (100%) rename mods/species/{bayliens => }/adherent/organs/organs_internal.dm (93%) rename mods/species/{bayliens => }/adherent/sound/chime.ogg (100%) rename mods/species/{bayliens => }/adherent/sound/ding.ogg (100%) delete mode 100644 mods/species/bayliens/_bayliens.dm delete mode 100644 mods/species/bayliens/_bayliens.dme delete mode 100644 mods/species/bayliens/_overrides.dm delete mode 100644 mods/species/bayliens/adherent/_adherent.dm delete mode 100644 mods/species/bayliens/skrell/_skrell.dm delete mode 100644 mods/species/bayliens/tajaran/_tajaran.dm delete mode 100644 mods/species/bayliens/tajaran/datum/blood.dm delete mode 100644 mods/species/bayliens/tajaran/machinery/suit_cycler.dm delete mode 100644 mods/species/bayliens/tritonian/_tritonian.dm delete mode 100644 mods/species/bayliens/unathi/_lizard.dm create mode 100644 mods/species/skrell/_skrell.dm create mode 100644 mods/species/skrell/_skrell.dme rename mods/species/{bayliens => }/skrell/datum/accessory.dm (97%) rename mods/species/{bayliens => }/skrell/datum/blood.dm (100%) rename mods/species/{bayliens => }/skrell/datum/culture.dm (100%) rename mods/species/{bayliens => }/skrell/datum/descriptor.dm (100%) rename mods/species/{bayliens => }/skrell/datum/emotes.dm (91%) rename mods/species/{bayliens => }/skrell/datum/faction.dm (100%) rename mods/species/{bayliens => }/skrell/datum/language.dm (84%) rename mods/species/{bayliens => }/skrell/datum/location.dm (100%) rename mods/species/{bayliens => }/skrell/datum/pronouns_skrell.dm (100%) rename mods/species/{bayliens => }/skrell/datum/religion.dm (100%) rename mods/species/{bayliens => }/skrell/datum/skrell_meat.dm (100%) rename mods/species/{bayliens => }/skrell/datum/species.dm (97%) rename mods/species/{bayliens => }/skrell/datum/species_bodytype.dm (90%) rename mods/species/{bayliens => }/skrell/gear/ammo.dm (82%) rename mods/species/{bayliens => }/skrell/gear/clustertool.dm (92%) rename mods/species/{bayliens => }/skrell/gear/fabrication_designs.dm (100%) rename mods/species/{bayliens => }/skrell/gear/gear.dm (93%) rename mods/species/{bayliens => }/skrell/gear/gear_ears.dm (67%) rename mods/species/{bayliens => }/skrell/gear/gear_head.dm (81%) rename mods/species/{bayliens => }/skrell/gear/gear_mask.dm (90%) rename mods/species/{bayliens => }/skrell/gear/gear_rig.dm (80%) rename mods/species/{bayliens => }/skrell/gear/gear_suit.dm (83%) rename mods/species/{bayliens => }/skrell/gear/gear_under.dm (73%) rename mods/species/{bayliens => }/skrell/icons/body/body.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/body/eyes.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/body/hair.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/body/organs.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/body/preview.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/accessories/obj_skrell_badge.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/accessories/obj_skrell_blank.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/band.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/chains_long.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/chains_short.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/chains_very_long.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/chains_very_short.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/cloth_long.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/ears/cloth_short.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/head/helmet_skrell.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/head/skrell_helmet_black.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/head/skrell_helmet_white.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/mask/gill_cover.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/suit/skrell_suit_black.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/suit/skrell_suit_white.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/clothing/under/skrell_uniform.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/ammo_unused.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/e_shield.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/gear.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/gear_rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/skrell_carbine.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/skrell_pistol.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/gear/skrell_rifle.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/combat/boots.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/combat/chest.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/combat/gloves.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/combat/helmet.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/combat/rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/command/boots.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/command/chest.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/command/gloves.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/command/helmet.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/command/rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/engineering/boots.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/engineering/chest.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/engineering/gloves.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/engineering/helmet.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/engineering/rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/medical/boots.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/medical/chest.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/medical/gloves.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/medical/helmet.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/medical/rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/standard/boots.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/standard/chest.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/standard/gloves.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/standard/helmet.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/rigs/standard/rig.dmi (100%) rename mods/species/{bayliens => }/skrell/icons/turf/skrellturf.dmi (100%) rename mods/species/{bayliens => }/skrell/names/first_name_skrell.txt (100%) rename mods/species/{bayliens => }/skrell/names/last_name_skrell.txt (100%) rename mods/species/{bayliens => }/skrell/sound/accessory.ogg (100%) rename mods/species/{bayliens => }/skrell/sound/drop/accessory.ogg (100%) rename mods/species/{bayliens => }/skrell/sound/pickup/accessory.ogg (100%) rename mods/species/{bayliens => }/skrell/sound/warble.ogg (100%) rename mods/species/{bayliens => }/skrell/turfs/flooring.dm (90%) create mode 100644 mods/species/tajaran/_tajaran.dm create mode 100644 mods/species/tajaran/_tajaran.dme rename mods/species/{bayliens => }/tajaran/datum/accessory.dm (96%) create mode 100644 mods/species/tajaran/datum/blood.dm rename mods/species/{bayliens => }/tajaran/datum/culture.dm (100%) rename mods/species/{bayliens => }/tajaran/datum/emotes.dm (53%) rename mods/species/{bayliens => }/tajaran/datum/language.dm (98%) rename mods/species/{bayliens => }/tajaran/datum/species.dm (79%) rename mods/species/{bayliens => }/tajaran/datum/species_bodytypes.dm (72%) rename mods/species/{bayliens => }/tajaran/icons/body.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/atmos/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/atmos_alt/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/deathsquad/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/engineering/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/engineering_alt/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/excavation/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/medical/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/medical_alt/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/merc/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/mining/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/mining_alt/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/nasa/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/pilot/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/salvage/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/sec/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/sec_alt/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/clothing/wizard/suit.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/cosmetics.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/deformed_body.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/eyes.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/facial.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/hair.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/markings.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/markings_old.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/organs.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/skeleton.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/tail.dmi (100%) rename mods/species/{bayliens => }/tajaran/icons/template.dmi (100%) create mode 100644 mods/species/tajaran/machinery/suit_cycler.dm rename mods/species/{bayliens => }/tajaran/sound/cat_purr.ogg (100%) rename mods/species/{bayliens => }/tajaran/sound/cat_purr_long.ogg (100%) create mode 100644 mods/species/tritonian/_tritonian.dm create mode 100644 mods/species/tritonian/_tritonian.dme rename mods/species/{bayliens => }/tritonian/datum/species.dm (100%) rename mods/species/{bayliens => }/tritonian/datum/species_bodytypes.dm (84%) rename mods/species/{bayliens => }/tritonian/icons/body_female.dmi (100%) rename mods/species/{bayliens => }/tritonian/icons/body_male.dmi (100%) rename mods/species/{bayliens => }/tritonian/icons/tritonian_preview.dmi (100%) create mode 100644 mods/species/unathi/_unathi.dm create mode 100644 mods/species/unathi/_unathi.dme rename mods/species/{bayliens => }/unathi/datum/autohiss.dm (100%) rename mods/species/{bayliens => }/unathi/datum/blood.dm (100%) rename mods/species/{bayliens => }/unathi/datum/culture.dm (83%) rename mods/species/{bayliens => }/unathi/datum/language.dm (97%) rename mods/species/{bayliens => }/unathi/datum/species.dm (87%) rename mods/species/{bayliens => }/unathi/datum/species_bodytypes.dm (66%) rename mods/species/{bayliens => }/unathi/datum/sprite_accessory.dm (63%) rename mods/species/{bayliens => }/unathi/icons/body_female.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/body_male.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/cosmetics.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/deformed_body_female.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/deformed_body_male.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/eyes.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/footprints.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/frills.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/horns.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/husk.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/organs.dmi (100%) rename mods/species/{bayliens => }/unathi/icons/tail.dmi (100%) rename mods/species/{bayliens => }/unathi/organs/organs_internal.dm (56%) rename mods/species/{bayliens => }/unathi/sound/lizard_breathing.ogg (100%) diff --git a/maps/exodus/exodus.dm b/maps/exodus/exodus.dm index 67ca1974ecce..415d4a9ea602 100644 --- a/maps/exodus/exodus.dm +++ b/maps/exodus/exodus.dm @@ -29,7 +29,11 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/serpentid/_serpentid.dme" #include "../../mods/species/utility_frames/_utility_frames.dme" diff --git a/maps/ministation/ministation.dm b/maps/ministation/ministation.dm index fca80d6d6478..4a4d02771021 100644 --- a/maps/ministation/ministation.dm +++ b/maps/ministation/ministation.dm @@ -45,7 +45,11 @@ Twice... #include "../../mods/content/tabloids/_tabloids.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" diff --git a/maps/modpack_testing/modpack_testing.dm b/maps/modpack_testing/modpack_testing.dm index 33b776920fbf..e6dea707f305 100644 --- a/maps/modpack_testing/modpack_testing.dm +++ b/maps/modpack_testing/modpack_testing.dm @@ -39,7 +39,11 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/drakes/_drakes.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" diff --git a/maps/tradeship/tradeship.dm b/maps/tradeship/tradeship.dm index 739a2948bae7..e829a3299185 100644 --- a/maps/tradeship/tradeship.dm +++ b/maps/tradeship/tradeship.dm @@ -39,7 +39,11 @@ #include "../../mods/mobs/dionaea/_dionaea.dme" #include "../../mods/species/ascent/_ascent.dme" - #include "../../mods/species/bayliens/_bayliens.dme" + #include "../../mods/species/tajaran/_tajaran.dme" + #include "../../mods/species/unathi/_unathi.dme" + #include "../../mods/species/skrell/_skrell.dme" + #include "../../mods/species/adherent/_adherent.dme" + #include "../../mods/species/tritonian/_tritonian.dme" #include "../../mods/species/drakes/_drakes.dme" #include "../../mods/species/neoavians/_neoavians.dme" #include "../../mods/species/serpentid/_serpentid.dme" diff --git a/mods/species/adherent/_adherent.dm b/mods/species/adherent/_adherent.dm new file mode 100644 index 000000000000..1686f9c95296 --- /dev/null +++ b/mods/species/adherent/_adherent.dm @@ -0,0 +1,31 @@ +#define LANGUAGE_ADHERENT "Protocol" +#define BP_FLOAT "floatation disc" +#define BP_JETS "maneuvering jets" +#define BP_COOLING_FINS "cooling fins" + +#define SPECIES_ADHERENT "Adherent" +#define BODYTYPE_ADHERENT "adherent body" + +/decl/modpack/adherent + name = "Adherent Species" + +/decl/modpack/adherent/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_ADHERENT + +/mob/living/human/Process_Spacemove(allow_movement) + . = ..() + if(.) + return + // This is horrible but short of spawning a jetpack inside the organ than locating + // it, I don't really see another viable approach short of a total jetpack refactor. + for(var/obj/item/organ/internal/powered/jets/jet in get_internal_organs()) + if(!jet.is_broken() && jet.active) + // Unlike Bay, we don't check or unset inertia_dir here + // because the spacedrift subsystem checks the return value of this proc + // and unsets inertia_dir if it returns nonzero. + return 1 + +/mob/living/human/adherent/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + species_name = SPECIES_ADHERENT + . = ..() \ No newline at end of file diff --git a/mods/species/adherent/_adherent.dme b/mods/species/adherent/_adherent.dme new file mode 100644 index 000000000000..2e916cfc7929 --- /dev/null +++ b/mods/species/adherent/_adherent.dme @@ -0,0 +1,15 @@ +#ifndef MODPACK_SPECIES_ADHERENT +#define MODPACK_SPECIES_ADHERENT +// BEGIN_INCLUDE +#include "_adherent.dm" +#include "datum\culture.dm" +#include "datum\emotes.dm" +#include "datum\faction.dm" +#include "datum\language.dm" +#include "datum\location.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "organs\organs_external.dm" +#include "organs\organs_internal.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/adherent/datum/culture.dm b/mods/species/adherent/datum/culture.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/culture.dm rename to mods/species/adherent/datum/culture.dm diff --git a/mods/species/bayliens/adherent/datum/emotes.dm b/mods/species/adherent/datum/emotes.dm similarity index 70% rename from mods/species/bayliens/adherent/datum/emotes.dm rename to mods/species/adherent/datum/emotes.dm index dd347dedd156..72cdd85fbcd2 100644 --- a/mods/species/bayliens/adherent/datum/emotes.dm +++ b/mods/species/adherent/datum/emotes.dm @@ -7,9 +7,9 @@ /decl/emote/audible/adherent_ding key = "ding" emote_message_3p = "$USER$ dings." - emote_sound = 'mods/species/bayliens/adherent/sound/ding.ogg' + emote_sound = 'mods/species/adherent/sound/ding.ogg' /decl/emote/audible/adherent_chime key = "chime" emote_message_3p = "$USER$ chimes." - emote_sound = 'mods/species/bayliens/adherent/sound/chime.ogg' + emote_sound = 'mods/species/adherent/sound/chime.ogg' diff --git a/mods/species/bayliens/adherent/datum/faction.dm b/mods/species/adherent/datum/faction.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/faction.dm rename to mods/species/adherent/datum/faction.dm diff --git a/mods/species/bayliens/adherent/datum/language.dm b/mods/species/adherent/datum/language.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/language.dm rename to mods/species/adherent/datum/language.dm diff --git a/mods/species/bayliens/adherent/datum/location.dm b/mods/species/adherent/datum/location.dm similarity index 100% rename from mods/species/bayliens/adherent/datum/location.dm rename to mods/species/adherent/datum/location.dm diff --git a/mods/species/bayliens/adherent/datum/species.dm b/mods/species/adherent/datum/species.dm similarity index 98% rename from mods/species/bayliens/adherent/datum/species.dm rename to mods/species/adherent/datum/species.dm index f9b4904ab4d9..c34634d726c7 100644 --- a/mods/species/bayliens/adherent/datum/species.dm +++ b/mods/species/adherent/datum/species.dm @@ -44,7 +44,7 @@ hazard_low_pressure = -1 strength = STR_HIGH - speech_sounds = list('mods/species/bayliens/adherent/sound/chime.ogg') + speech_sounds = list('mods/species/adherent/sound/chime.ogg') speech_chance = 25 species_flags = SPECIES_FLAG_NO_POISON | SPECIES_FLAG_NO_MINOR_CUT diff --git a/mods/species/bayliens/adherent/datum/species_bodytypes.dm b/mods/species/adherent/datum/species_bodytypes.dm similarity index 82% rename from mods/species/bayliens/adherent/datum/species_bodytypes.dm rename to mods/species/adherent/datum/species_bodytypes.dm index bbf275eb8558..ae9b69dda28c 100644 --- a/mods/species/bayliens/adherent/datum/species_bodytypes.dm +++ b/mods/species/adherent/datum/species_bodytypes.dm @@ -2,10 +2,10 @@ name = "turquoise" desc = "A gleaming crystalline mass." bodytype_category = BODYTYPE_ADHERENT - icon_template = 'mods/species/bayliens/adherent/icons/template.dmi' - icon_base = 'mods/species/bayliens/adherent/icons/body_turquoise.dmi' - damage_overlays = 'mods/species/bayliens/adherent/icons/damage_overlay.dmi' - blood_overlays = 'mods/species/bayliens/adherent/icons/blood_overlays.dmi' + icon_template = 'mods/species/adherent/icons/template.dmi' + icon_base = 'mods/species/adherent/icons/body_turquoise.dmi' + damage_overlays = 'mods/species/adherent/icons/damage_overlay.dmi' + blood_overlays = 'mods/species/adherent/icons/blood_overlays.dmi' antaghud_offset_y = 14 movement_slowdown = -1 appearance_flags = HAS_EYE_COLOR @@ -49,7 +49,7 @@ ) eye_contaminant_guard = TRUE eye_innate_flash_protection = FLASH_PROTECTION_MAJOR - eye_icon = 'mods/species/bayliens/adherent/icons/eyes.dmi' + eye_icon = 'mods/species/adherent/icons/eyes.dmi' uid = "bodytype_crystalline_adherent_turquoise" /decl/bodytype/crystalline/adherent/Initialize() @@ -105,35 +105,35 @@ /decl/bodytype/crystalline/adherent/emerald name = "emerald" - icon_base = 'mods/species/bayliens/adherent/icons/body_emerald.dmi' + icon_base = 'mods/species/adherent/icons/body_emerald.dmi' uid = "bodytype_crystalline_adherent_emerald" /decl/bodytype/crystalline/adherent/amethyst name = "amethyst" - icon_base = 'mods/species/bayliens/adherent/icons/body_amethyst.dmi' + icon_base = 'mods/species/adherent/icons/body_amethyst.dmi' uid = "bodytype_crystalline_adherent_amethyst" /decl/bodytype/crystalline/adherent/sapphire name = "sapphire" - icon_base = 'mods/species/bayliens/adherent/icons/body_sapphire.dmi' + icon_base = 'mods/species/adherent/icons/body_sapphire.dmi' uid = "bodytype_crystalline_adherent_sapphire" /decl/bodytype/crystalline/adherent/ruby name = "ruby" - icon_base = 'mods/species/bayliens/adherent/icons/body_ruby.dmi' + icon_base = 'mods/species/adherent/icons/body_ruby.dmi' uid = "bodytype_crystalline_adherent_ruby" /decl/bodytype/crystalline/adherent/topaz name = "topaz" - icon_base = 'mods/species/bayliens/adherent/icons/body_topaz.dmi' + icon_base = 'mods/species/adherent/icons/body_topaz.dmi' uid = "bodytype_crystalline_adherent_topaz" /decl/bodytype/crystalline/adherent/quartz name = "quartz" - icon_base = 'mods/species/bayliens/adherent/icons/body_quartz.dmi' + icon_base = 'mods/species/adherent/icons/body_quartz.dmi' uid = "bodytype_crystalline_adherent_quartz" /decl/bodytype/crystalline/adherent/jet name = "jet" - icon_base = 'mods/species/bayliens/adherent/icons/body_jet.dmi' + icon_base = 'mods/species/adherent/icons/body_jet.dmi' uid = "bodytype_crystalline_adherent_jet" diff --git a/mods/species/bayliens/adherent/icons/actions.dmi b/mods/species/adherent/icons/actions.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/actions.dmi rename to mods/species/adherent/icons/actions.dmi diff --git a/mods/species/bayliens/adherent/icons/blood_overlays.dmi b/mods/species/adherent/icons/blood_overlays.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/blood_overlays.dmi rename to mods/species/adherent/icons/blood_overlays.dmi diff --git a/mods/species/bayliens/adherent/icons/body_amethyst.dmi b/mods/species/adherent/icons/body_amethyst.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_amethyst.dmi rename to mods/species/adherent/icons/body_amethyst.dmi diff --git a/mods/species/bayliens/adherent/icons/body_emerald.dmi b/mods/species/adherent/icons/body_emerald.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_emerald.dmi rename to mods/species/adherent/icons/body_emerald.dmi diff --git a/mods/species/bayliens/adherent/icons/body_jet.dmi b/mods/species/adherent/icons/body_jet.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_jet.dmi rename to mods/species/adherent/icons/body_jet.dmi diff --git a/mods/species/bayliens/adherent/icons/body_quartz.dmi b/mods/species/adherent/icons/body_quartz.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_quartz.dmi rename to mods/species/adherent/icons/body_quartz.dmi diff --git a/mods/species/bayliens/adherent/icons/body_ruby.dmi b/mods/species/adherent/icons/body_ruby.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_ruby.dmi rename to mods/species/adherent/icons/body_ruby.dmi diff --git a/mods/species/bayliens/adherent/icons/body_sapphire.dmi b/mods/species/adherent/icons/body_sapphire.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_sapphire.dmi rename to mods/species/adherent/icons/body_sapphire.dmi diff --git a/mods/species/bayliens/adherent/icons/body_topaz.dmi b/mods/species/adherent/icons/body_topaz.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_topaz.dmi rename to mods/species/adherent/icons/body_topaz.dmi diff --git a/mods/species/bayliens/adherent/icons/body_turquoise.dmi b/mods/species/adherent/icons/body_turquoise.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/body_turquoise.dmi rename to mods/species/adherent/icons/body_turquoise.dmi diff --git a/mods/species/bayliens/adherent/icons/damage_overlay.dmi b/mods/species/adherent/icons/damage_overlay.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/damage_overlay.dmi rename to mods/species/adherent/icons/damage_overlay.dmi diff --git a/mods/species/bayliens/adherent/icons/eyes.dmi b/mods/species/adherent/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/eyes.dmi rename to mods/species/adherent/icons/eyes.dmi diff --git a/mods/species/bayliens/adherent/icons/organs.dmi b/mods/species/adherent/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/organs.dmi rename to mods/species/adherent/icons/organs.dmi diff --git a/mods/species/bayliens/adherent/icons/template.dmi b/mods/species/adherent/icons/template.dmi similarity index 100% rename from mods/species/bayliens/adherent/icons/template.dmi rename to mods/species/adherent/icons/template.dmi diff --git a/mods/species/bayliens/adherent/organs/organs_external.dm b/mods/species/adherent/organs/organs_external.dm similarity index 100% rename from mods/species/bayliens/adherent/organs/organs_external.dm rename to mods/species/adherent/organs/organs_external.dm diff --git a/mods/species/bayliens/adherent/organs/organs_internal.dm b/mods/species/adherent/organs/organs_internal.dm similarity index 93% rename from mods/species/bayliens/adherent/organs/organs_internal.dm rename to mods/species/adherent/organs/organs_internal.dm index 3a7cb3475b45..94990cd3f5e4 100644 --- a/mods/species/bayliens/adherent/organs/organs_internal.dm +++ b/mods/species/adherent/organs/organs_internal.dm @@ -1,11 +1,11 @@ #define PROTOCOL_ARTICLE "Protocol article [rand(100,999)]-[uppertext(pick(global.alphabet))] subsection #[rand(10,99)]" /datum/action/item_action/organ/adherent - button_icon = 'mods/species/bayliens/adherent/icons/actions.dmi' + button_icon = 'mods/species/adherent/icons/actions.dmi' /obj/item/organ/internal/brain/adherent name = "mentality matrix" desc = "The self-contained, self-supporting internal 'brain' of an Adherent unit." - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "brain" action_button_name = "Reset Ident" action_button_desc = "Updates your public name to reflect your current job" @@ -48,7 +48,7 @@ to_chat(user, "You are now designated [owner.real_name].") /obj/item/organ/internal/powered - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' organ_properties = ORGAN_PROP_CRYSTAL var/maintenance_cost = 1 var/base_action_state @@ -73,7 +73,7 @@ /obj/item/organ/internal/powered/attack_self(var/mob/user) . = ..() if(.) - sound_to(user, sound('mods/species/bayliens/adherent/sound/ding.ogg')) + sound_to(user, sound('mods/species/adherent/sound/ding.ogg')) if(is_broken()) to_chat(owner, "\The [src] [gender == PLURAL ? "are" : "is"] too damaged to function.") active = FALSE @@ -120,7 +120,7 @@ /obj/item/organ/internal/eyes/adherent name = "receptor prism" - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "eyes" organ_properties = ORGAN_PROP_CRYSTAL @@ -130,7 +130,7 @@ /obj/item/organ/internal/cell/adherent name = "piezoelectric core" - icon = 'mods/species/bayliens/adherent/icons/organs.dmi' + icon = 'mods/species/adherent/icons/organs.dmi' icon_state = "cell" /obj/item/organ/internal/powered/cooling_fins diff --git a/mods/species/bayliens/adherent/sound/chime.ogg b/mods/species/adherent/sound/chime.ogg similarity index 100% rename from mods/species/bayliens/adherent/sound/chime.ogg rename to mods/species/adherent/sound/chime.ogg diff --git a/mods/species/bayliens/adherent/sound/ding.ogg b/mods/species/adherent/sound/ding.ogg similarity index 100% rename from mods/species/bayliens/adherent/sound/ding.ogg rename to mods/species/adherent/sound/ding.ogg diff --git a/mods/species/bayliens/_bayliens.dm b/mods/species/bayliens/_bayliens.dm deleted file mode 100644 index 80febefc65ea..000000000000 --- a/mods/species/bayliens/_bayliens.dm +++ /dev/null @@ -1,40 +0,0 @@ -#define SPECIES_SKRELL "Skrell" -#define SPECIES_TAJARA "Tajara" -#define SPECIES_LIZARD "Unathi" -#define SPECIES_ADHERENT "Adherent" - -#define BODYTYPE_FELINE "feline body" -#define BODYTYPE_ADHERENT "adherent body" - -#define BODY_EQUIP_FLAG_FELINE BITFLAG(7) - -/decl/modpack/bayliens - name = "Baystation 12 Aliens" - tabloid_headlines = list( - "SHOCKING FIGURES REVEAL MORE TEENS DIE TO UNATHI HONOUR DUELS THAN GUN VIOLENCE", - "LOCAL UNATHI SYMPATHIZER: 'I really think you should stop with these spacebaiting articles.'", - "DO UNATHI SYMPATHIZERS HATE THE HUMAN RACE?", - "TENTACLES OF TERROR: SKRELL BLACK OPS SEIGE NYX NAVAL DEPOT. SHOCKING PHOTOGRAPHS INSIDE!", - "LOCAL MAN HAS SEIZURE AFTER SAYING SKRELLIAN NAME; FORCED ASSIMILATION SOON?", - "TAJARANS: CUTE AND CUDDLY, OR INFILTRATING THE GOVERNMENT? FIND OUT MORE INSIDE" - ) - -/decl/modpack/bayliens/pre_initialize() - ..() - SSmodpacks.default_submap_whitelisted_species |= SPECIES_TAJARA - SSmodpacks.default_submap_whitelisted_species |= SPECIES_LIZARD - SSmodpacks.default_submap_whitelisted_species |= SPECIES_SKRELL - SSmodpacks.default_submap_whitelisted_species |= SPECIES_ADHERENT - -/mob/living/human/Process_Spacemove(allow_movement) - . = ..() - if(.) - return - // This is horrible but short of spawning a jetpack inside the organ than locating - // it, I don't really see another viable approach short of a total jetpack refactor. - for(var/obj/item/organ/internal/powered/jets/jet in get_internal_organs()) - if(!jet.is_broken() && jet.active) - // Unlike Bay, we don't check or unset inertia_dir here - // because the spacedrift subsystem checks the return value of this proc - // and unsets inertia_dir if it returns nonzero. - return 1 diff --git a/mods/species/bayliens/_bayliens.dme b/mods/species/bayliens/_bayliens.dme deleted file mode 100644 index 014aba6cf5d8..000000000000 --- a/mods/species/bayliens/_bayliens.dme +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef MODPACK_BAYLIENS -#define MODPACK_BAYLIENS -// BEGIN_INCLUDE -#include "_bayliens.dm" -#include "_overrides.dm" -#include "adherent\_adherent.dm" -#include "adherent\datum\culture.dm" -#include "adherent\datum\emotes.dm" -#include "adherent\datum\faction.dm" -#include "adherent\datum\language.dm" -#include "adherent\datum\location.dm" -#include "adherent\datum\species.dm" -#include "adherent\datum\species_bodytypes.dm" -#include "adherent\organs\organs_external.dm" -#include "adherent\organs\organs_internal.dm" -#include "skrell\_skrell.dm" -#include "skrell\datum\accessory.dm" -#include "skrell\datum\blood.dm" -#include "skrell\datum\culture.dm" -#include "skrell\datum\descriptor.dm" -#include "skrell\datum\emotes.dm" -#include "skrell\datum\faction.dm" -#include "skrell\datum\language.dm" -#include "skrell\datum\location.dm" -#include "skrell\datum\pronouns_skrell.dm" -#include "skrell\datum\religion.dm" -#include "skrell\datum\skrell_meat.dm" -#include "skrell\datum\species.dm" -#include "skrell\datum\species_bodytype.dm" -#include "skrell\gear\ammo.dm" -#include "skrell\gear\clustertool.dm" -#include "skrell\gear\fabrication_designs.dm" -#include "skrell\gear\gear.dm" -#include "skrell\gear\gear_ears.dm" -#include "skrell\gear\gear_head.dm" -#include "skrell\gear\gear_mask.dm" -#include "skrell\gear\gear_rig.dm" -#include "skrell\gear\gear_suit.dm" -#include "skrell\gear\gear_under.dm" -#include "skrell\turfs\flooring.dm" -#include "tajaran\_tajaran.dm" -#include "tajaran\datum\accessory.dm" -#include "tajaran\datum\blood.dm" -#include "tajaran\datum\culture.dm" -#include "tajaran\datum\emotes.dm" -#include "tajaran\datum\language.dm" -#include "tajaran\datum\species.dm" -#include "tajaran\datum\species_bodytypes.dm" -#include "tajaran\machinery\suit_cycler.dm" -#include "tritonian\_tritonian.dm" -#include "tritonian\datum\species.dm" -#include "tritonian\datum\species_bodytypes.dm" -#include "unathi\_lizard.dm" -#include "unathi\datum\autohiss.dm" -#include "unathi\datum\blood.dm" -#include "unathi\datum\culture.dm" -#include "unathi\datum\language.dm" -#include "unathi\datum\species.dm" -#include "unathi\datum\species_bodytypes.dm" -#include "unathi\datum\sprite_accessory.dm" -#include "unathi\organs\organs_internal.dm" -// END_INCLUDE -#endif diff --git a/mods/species/bayliens/_overrides.dm b/mods/species/bayliens/_overrides.dm deleted file mode 100644 index 5eb6f5a85583..000000000000 --- a/mods/species/bayliens/_overrides.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/item - var/_feline_onmob_icon - -/obj/item/setup_sprite_sheets() - . = ..() - if(_feline_onmob_icon) - LAZYSET(sprite_sheets, BODYTYPE_FELINE, _feline_onmob_icon) diff --git a/mods/species/bayliens/adherent/_adherent.dm b/mods/species/bayliens/adherent/_adherent.dm deleted file mode 100644 index d70f337115d7..000000000000 --- a/mods/species/bayliens/adherent/_adherent.dm +++ /dev/null @@ -1,8 +0,0 @@ -#define LANGUAGE_ADHERENT "Protocol" -#define BP_FLOAT "floatation disc" -#define BP_JETS "maneuvering jets" -#define BP_COOLING_FINS "cooling fins" - -/mob/living/human/adherent/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - species_name = SPECIES_ADHERENT - . = ..() \ No newline at end of file diff --git a/mods/species/bayliens/skrell/_skrell.dm b/mods/species/bayliens/skrell/_skrell.dm deleted file mode 100644 index 74094628d1e2..000000000000 --- a/mods/species/bayliens/skrell/_skrell.dm +++ /dev/null @@ -1,4 +0,0 @@ - -/mob/living/human/skrell/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - species_name = SPECIES_SKRELL - . = ..() \ No newline at end of file diff --git a/mods/species/bayliens/tajaran/_tajaran.dm b/mods/species/bayliens/tajaran/_tajaran.dm deleted file mode 100644 index 151b2b1c8a7a..000000000000 --- a/mods/species/bayliens/tajaran/_tajaran.dm +++ /dev/null @@ -1,9 +0,0 @@ -#define LANGUAGE_TAJARA "Siik'maas" - -/obj/item/clothing/setup_equip_flags() - . = ..() - if(bodytype_equip_flags & BODY_EQUIP_FLAG_EXCLUDE) - bodytype_equip_flags |= BODY_EQUIP_FLAG_FELINE - -/mob/living/human/tajaran/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - . = ..(species_name = SPECIES_TAJARA) diff --git a/mods/species/bayliens/tajaran/datum/blood.dm b/mods/species/bayliens/tajaran/datum/blood.dm deleted file mode 100644 index 29282ccbd58d..000000000000 --- a/mods/species/bayliens/tajaran/datum/blood.dm +++ /dev/null @@ -1,58 +0,0 @@ -/decl/blood_type/feline - antigen_category = "feline" - splatter_colour = "#862a51" - abstract_type = /decl/blood_type/feline - -/decl/blood_type/feline/mplus - name = "M+" - antigens = list("M", "Fe") - random_weighting = 28 - -/decl/blood_type/feline/mminus - name = "M-" - antigens = list("M") - random_weighting = 3 - -/decl/blood_type/feline/rplus - name = "R+" - antigens = list("R", "Fe") - random_weighting = 20 - -/decl/blood_type/feline/rminus - name = "R-" - antigens = list("R",) - -/decl/blood_type/feline/mrplus - name = "MR+" - antigens = list("M", "R", "Fe") - random_weighting = 5 - -/decl/blood_type/feline/mrminus - name = "MR-" - antigens = list("M", "R") - -/decl/blood_type/feline/oplus - name = "Of+" - antigens = list("Fe") - random_weighting = 36 - -/decl/blood_type/feline/ominus - name = "Of-" - random_weighting = 4 - -/obj/item/chems/ivbag/blood/feline_mplus - label_text = "M+" -/obj/item/chems/ivbag/blood/feline_mminus - label_text = "M-" -/obj/item/chems/ivbag/blood/feline_rplus - label_text = "R+" -/obj/item/chems/ivbag/blood/feline_mminus - label_text = "M-" -/obj/item/chems/ivbag/blood/feline_mrplus - label_text = "MR+" -/obj/item/chems/ivbag/blood/feline_mrminus - label_text = "MR-" -/obj/item/chems/ivbag/blood/feline_oplus - label_text = "Of+" -/obj/item/chems/ivbag/blood/feline_oplus - label_text = "Of-" diff --git a/mods/species/bayliens/tajaran/machinery/suit_cycler.dm b/mods/species/bayliens/tajaran/machinery/suit_cycler.dm deleted file mode 100644 index e3be8485345b..000000000000 --- a/mods/species/bayliens/tajaran/machinery/suit_cycler.dm +++ /dev/null @@ -1,52 +0,0 @@ -/obj/machinery/suit_cycler/Initialize() - LAZYDISTINCTADD(available_bodytypes, BODYTYPE_FELINE) - . = ..() - -/obj/item/clothing/suit/space/void/merc - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi' - -/obj/item/clothing/suit/space/void/swat - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi' - -/obj/item/clothing/suit/space/void/mining - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi' - -/obj/item/clothing/suit/space/void/medical - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi' - -/obj/item/clothing/suit/space/void/security - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi' - -/obj/item/clothing/suit/space/void/atmos - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/mining/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/medical/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/security/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/atmos/alt - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi' - -/obj/item/clothing/suit/space/void/engineering/salvage - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi' - -/obj/item/clothing/suit/space/void/expedition - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi' - -/obj/item/clothing/suit/space/void - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi' - - -/obj/item/clothing/suit/space/void/excavation - _feline_onmob_icon = 'mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi' diff --git a/mods/species/bayliens/tritonian/_tritonian.dm b/mods/species/bayliens/tritonian/_tritonian.dm deleted file mode 100644 index 52ec72110ffe..000000000000 --- a/mods/species/bayliens/tritonian/_tritonian.dm +++ /dev/null @@ -1 +0,0 @@ -#define SPECIES_TRITONIAN "Tritonian" diff --git a/mods/species/bayliens/unathi/_lizard.dm b/mods/species/bayliens/unathi/_lizard.dm deleted file mode 100644 index 5db7c43c7a07..000000000000 --- a/mods/species/bayliens/unathi/_lizard.dm +++ /dev/null @@ -1,5 +0,0 @@ -#define LANGUAGE_LIZARD "Sinta'unathi" - -/mob/living/human/lizard/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) - species_name = SPECIES_LIZARD - . = ..() diff --git a/mods/species/skrell/_skrell.dm b/mods/species/skrell/_skrell.dm new file mode 100644 index 000000000000..c038ee1d7d22 --- /dev/null +++ b/mods/species/skrell/_skrell.dm @@ -0,0 +1,16 @@ +#define SPECIES_SKRELL "Skrell" + +/decl/modpack/skrell + name = "Skrell Species" + tabloid_headlines = list( + "TENTACLES OF TERROR: SKRELL BLACK OPS SEIGE NYX NAVAL DEPOT. SHOCKING PHOTOGRAPHS INSIDE!", + "LOCAL MAN HAS SEIZURE AFTER SAYING SKRELLIAN NAME; FORCED ASSIMILATION SOON?" + ) + +/decl/modpack/skrell/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_SKRELL + +/mob/living/human/skrell/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + species_name = SPECIES_SKRELL + . = ..() diff --git a/mods/species/skrell/_skrell.dme b/mods/species/skrell/_skrell.dme new file mode 100644 index 000000000000..e10b661dadb6 --- /dev/null +++ b/mods/species/skrell/_skrell.dme @@ -0,0 +1,30 @@ +#ifndef MODPACK_SPECIES_SKRELL +#define MODPACK_SPECIES_SKRELL +// BEGIN_INCLUDE +#include "_skrell.dm" +#include "datum\accessory.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\descriptor.dm" +#include "datum\emotes.dm" +#include "datum\faction.dm" +#include "datum\language.dm" +#include "datum\location.dm" +#include "datum\pronouns_skrell.dm" +#include "datum\religion.dm" +#include "datum\skrell_meat.dm" +#include "datum\species.dm" +#include "datum\species_bodytype.dm" +#include "gear\ammo.dm" +#include "gear\clustertool.dm" +#include "gear\fabrication_designs.dm" +#include "gear\gear.dm" +#include "gear\gear_ears.dm" +#include "gear\gear_head.dm" +#include "gear\gear_mask.dm" +#include "gear\gear_rig.dm" +#include "gear\gear_suit.dm" +#include "gear\gear_under.dm" +#include "turfs\flooring.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/skrell/datum/accessory.dm b/mods/species/skrell/datum/accessory.dm similarity index 97% rename from mods/species/bayliens/skrell/datum/accessory.dm rename to mods/species/skrell/datum/accessory.dm index 99213a4e0c16..86dc5b9755ab 100644 --- a/mods/species/bayliens/skrell/datum/accessory.dm +++ b/mods/species/skrell/datum/accessory.dm @@ -1,6 +1,6 @@ /decl/sprite_accessory/hair/skrell name = "Kanin - Very Short Headtails" - icon = 'mods/species/bayliens/skrell/icons/body/hair.dmi' + icon = 'mods/species/skrell/icons/body/hair.dmi' icon_state = "very_short" species_allowed = list(SPECIES_SKRELL) uid = "acc_hair_skrell_veryshort" diff --git a/mods/species/bayliens/skrell/datum/blood.dm b/mods/species/skrell/datum/blood.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/blood.dm rename to mods/species/skrell/datum/blood.dm diff --git a/mods/species/bayliens/skrell/datum/culture.dm b/mods/species/skrell/datum/culture.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/culture.dm rename to mods/species/skrell/datum/culture.dm diff --git a/mods/species/bayliens/skrell/datum/descriptor.dm b/mods/species/skrell/datum/descriptor.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/descriptor.dm rename to mods/species/skrell/datum/descriptor.dm diff --git a/mods/species/bayliens/skrell/datum/emotes.dm b/mods/species/skrell/datum/emotes.dm similarity index 91% rename from mods/species/bayliens/skrell/datum/emotes.dm rename to mods/species/skrell/datum/emotes.dm index 3bb122ec9122..098bc81c3b3f 100644 --- a/mods/species/bayliens/skrell/datum/emotes.dm +++ b/mods/species/skrell/datum/emotes.dm @@ -10,7 +10,7 @@ /decl/emote/audible/warble key = "warble" emote_message_3p = "$USER$ warbles." - emote_sound = 'mods/species/bayliens/skrell/sound/warble.ogg' + emote_sound = 'mods/species/skrell/sound/warble.ogg' /decl/emote/audible/croak key = "croak" diff --git a/mods/species/bayliens/skrell/datum/faction.dm b/mods/species/skrell/datum/faction.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/faction.dm rename to mods/species/skrell/datum/faction.dm diff --git a/mods/species/bayliens/skrell/datum/language.dm b/mods/species/skrell/datum/language.dm similarity index 84% rename from mods/species/bayliens/skrell/datum/language.dm rename to mods/species/skrell/datum/language.dm index d103e2351f18..6068a692a1dd 100644 --- a/mods/species/bayliens/skrell/datum/language.dm +++ b/mods/species/skrell/datum/language.dm @@ -1,5 +1,5 @@ -var/global/list/first_name_skrell = file2list("mods/species/bayliens/skrell/names/first_name_skrell.txt") -var/global/list/last_name_skrell = file2list("mods/species/bayliens/skrell/names/last_name_skrell.txt") +var/global/list/first_name_skrell = file2list("mods/species/skrell/names/first_name_skrell.txt") +var/global/list/last_name_skrell = file2list("mods/species/skrell/names/last_name_skrell.txt") /decl/language/skrell name = "Common Skrellian" diff --git a/mods/species/bayliens/skrell/datum/location.dm b/mods/species/skrell/datum/location.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/location.dm rename to mods/species/skrell/datum/location.dm diff --git a/mods/species/bayliens/skrell/datum/pronouns_skrell.dm b/mods/species/skrell/datum/pronouns_skrell.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/pronouns_skrell.dm rename to mods/species/skrell/datum/pronouns_skrell.dm diff --git a/mods/species/bayliens/skrell/datum/religion.dm b/mods/species/skrell/datum/religion.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/religion.dm rename to mods/species/skrell/datum/religion.dm diff --git a/mods/species/bayliens/skrell/datum/skrell_meat.dm b/mods/species/skrell/datum/skrell_meat.dm similarity index 100% rename from mods/species/bayliens/skrell/datum/skrell_meat.dm rename to mods/species/skrell/datum/skrell_meat.dm diff --git a/mods/species/bayliens/skrell/datum/species.dm b/mods/species/skrell/datum/species.dm similarity index 97% rename from mods/species/bayliens/skrell/datum/species.dm rename to mods/species/skrell/datum/species.dm index c52a6dc67358..ac49a3c8a8b9 100644 --- a/mods/species/bayliens/skrell/datum/species.dm +++ b/mods/species/skrell/datum/species.dm @@ -45,7 +45,7 @@ spawn_flags = SPECIES_CAN_JOIN flesh_color = "#8cd7a3" - organs_icon = 'mods/species/bayliens/skrell/icons/body/organs.dmi' + organs_icon = 'mods/species/skrell/icons/body/organs.dmi' blood_types = list( /decl/blood_type/skrell/yplus, @@ -144,4 +144,4 @@ /obj/item/organ/internal/eyes/skrell name = "amphibian eyes" desc = "Large black orbs, belonging to some sort of giant frog by looks of it." - icon = 'mods/species/bayliens/skrell/icons/body/organs.dmi' + icon = 'mods/species/skrell/icons/body/organs.dmi' diff --git a/mods/species/bayliens/skrell/datum/species_bodytype.dm b/mods/species/skrell/datum/species_bodytype.dm similarity index 90% rename from mods/species/bayliens/skrell/datum/species_bodytype.dm rename to mods/species/skrell/datum/species_bodytype.dm index 2bd89cc0562e..b4f0d5d9ce1d 100644 --- a/mods/species/bayliens/skrell/datum/species_bodytype.dm +++ b/mods/species/skrell/datum/species_bodytype.dm @@ -1,12 +1,12 @@ /decl/bodytype/skrell name = "skrellian body" - icon_base = 'mods/species/bayliens/skrell/icons/body/body.dmi' + icon_base = 'mods/species/skrell/icons/body/body.dmi' bandages_icon = 'icons/mob/bandage.dmi' health_hud_intensity = 1.75 associated_gender = PLURAL eye_darksight_range = 4 eye_flash_mod = 1.2 - eye_icon = 'mods/species/bayliens/skrell/icons/body/eyes.dmi' + eye_icon = 'mods/species/skrell/icons/body/eyes.dmi' apply_eye_colour = FALSE uid = "bodytype_skrell" appearance_flags = HAS_UNDERWEAR | HAS_SKIN_COLOR diff --git a/mods/species/bayliens/skrell/gear/ammo.dm b/mods/species/skrell/gear/ammo.dm similarity index 82% rename from mods/species/bayliens/skrell/gear/ammo.dm rename to mods/species/skrell/gear/ammo.dm index e9c331157d84..a7a979853e94 100644 --- a/mods/species/bayliens/skrell/gear/ammo.dm +++ b/mods/species/skrell/gear/ammo.dm @@ -1,7 +1,7 @@ /obj/item/magnetic_ammo/skrell name = "ZT-8 cylinder" desc = "A magazine containing flechettes, the design harkening back to cylinders on revolvers." - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_rifle.dmi' icon_state = "skrell_magazine" projectile_type = /obj/item/projectile/bullet/magnetic/slug projectile_name = "slug" diff --git a/mods/species/bayliens/skrell/gear/clustertool.dm b/mods/species/skrell/gear/clustertool.dm similarity index 92% rename from mods/species/bayliens/skrell/gear/clustertool.dm rename to mods/species/skrell/gear/clustertool.dm index 31d153a593d8..7a00e5c94a06 100644 --- a/mods/species/bayliens/skrell/gear/clustertool.dm +++ b/mods/species/skrell/gear/clustertool.dm @@ -1,7 +1,7 @@ /obj/item/clustertool name = "alien clustertool" desc = "A bewilderingly complex knot of tool heads." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "clustertool" w_class = ITEM_SIZE_SMALL diff --git a/mods/species/bayliens/skrell/gear/fabrication_designs.dm b/mods/species/skrell/gear/fabrication_designs.dm similarity index 100% rename from mods/species/bayliens/skrell/gear/fabrication_designs.dm rename to mods/species/skrell/gear/fabrication_designs.dm diff --git a/mods/species/bayliens/skrell/gear/gear.dm b/mods/species/skrell/gear/gear.dm similarity index 93% rename from mods/species/bayliens/skrell/gear/gear.dm rename to mods/species/skrell/gear/gear.dm index 40788b67b9b6..52b33e247137 100644 --- a/mods/species/bayliens/skrell/gear/gear.dm +++ b/mods/species/skrell/gear/gear.dm @@ -21,7 +21,7 @@ /obj/item/cell/skrell name = "skrellian microfusion cell" desc = "An impossibly tiny fusion power engine of Skrell design." - icon = 'mods/species/bayliens/skrell/icons/gear/gear.dmi' + icon = 'mods/species/skrell/icons/gear/gear.dmi' icon_state = "skrellcell" maxcharge = 1500 w_class = ITEM_SIZE_NORMAL @@ -43,7 +43,7 @@ /obj/item/shield/energy/skrell name = "skrellian combat shield" desc = "An alien shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." - icon = 'mods/species/bayliens/skrell/icons/gear/e_shield.dmi' + icon = 'mods/species/skrell/icons/gear/e_shield.dmi' icon_state = "skrellshield" shield_light_color = "#bf7efc" @@ -55,7 +55,7 @@ w_class = ITEM_SIZE_NORMAL icon_state = ICON_STATE_WORLD slot_flags = SLOT_LOWER_BODY|SLOT_HOLSTER - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_pistol.dmi' max_shots = 10 fire_delay = 6 one_hand_penalty = 1 @@ -71,7 +71,7 @@ /obj/item/gun/magnetic/railgun/skrell name = "ZT-8 Railgun" desc = "The Zquiv*Tzuuli-8, or ZT-8, is a railgun rarely seen by anyone other than those within Skrellian SDTF ranks. The rotary magazine houses a cylinder with individual chambers, that press against the barrel when loaded." - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_rifle.dmi' icon_state = ICON_STATE_WORLD item_state = "skrell_rifle" one_hand_penalty = 3 @@ -89,7 +89,7 @@ /obj/item/gun/energy/pulse_rifle/skrell name = "VT-3 Carbine" - icon = 'mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi' + icon = 'mods/species/skrell/icons/gear/skrell_carbine.dmi' icon_state = ICON_STATE_WORLD item_state = "skrell_carbine" slot_flags = SLOT_BACK|SLOT_LOWER_BODY diff --git a/mods/species/bayliens/skrell/gear/gear_ears.dm b/mods/species/skrell/gear/gear_ears.dm similarity index 67% rename from mods/species/bayliens/skrell/gear/gear_ears.dm rename to mods/species/skrell/gear/gear_ears.dm index b2d1a45501a9..338e30307fe3 100644 --- a/mods/species/bayliens/skrell/gear/gear_ears.dm +++ b/mods/species/skrell/gear/gear_ears.dm @@ -10,35 +10,35 @@ /obj/item/clothing/ears/skrell/band name = "headtail bands" desc = "Metallic bands worn by skrell to adorn their head tails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/band.dmi' - drop_sound = 'mods/species/bayliens/skrell/sound/drop/accessory.ogg' - pickup_sound = 'mods/species/bayliens/skrell/sound/pickup/accessory.ogg' + icon = 'mods/species/skrell/icons/clothing/ears/band.dmi' + drop_sound = 'mods/species/skrell/sound/drop/accessory.ogg' + pickup_sound = 'mods/species/skrell/sound/pickup/accessory.ogg' /obj/item/clothing/ears/skrell/band/chains name = "very short headtail chains" desc = "A delicate chain worn by skrell to decorate their headtails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_very_short.dmi' /obj/item/clothing/ears/skrell/band/chains/short name = "short headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_short.dmi' /obj/item/clothing/ears/skrell/band/chains/long name = "long headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_long.dmi' /obj/item/clothing/ears/skrell/band/chains/very_long name = "very long headtail chains" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/chains_very_long.dmi' /obj/item/clothing/ears/skrell/cloth name = "short headtail cloth" desc = "A cloth shawl worn by skrell draped around their head tails." - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/cloth_short.dmi' /obj/item/clothing/ears/skrell/cloth/long name = "long headtail cloth" - icon = 'mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi' + icon = 'mods/species/skrell/icons/clothing/ears/cloth_long.dmi' /decl/loadout_option/ears/skrell name = "skrell headtail accessory selection" diff --git a/mods/species/bayliens/skrell/gear/gear_head.dm b/mods/species/skrell/gear/gear_head.dm similarity index 81% rename from mods/species/bayliens/skrell/gear/gear_head.dm rename to mods/species/skrell/gear/gear_head.dm index 6621dd11301d..655c5b99824f 100644 --- a/mods/species/bayliens/skrell/gear/gear_head.dm +++ b/mods/species/skrell/gear/gear_head.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/helmet/space/void/skrell name = "alien helmet" - icon = 'mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi' + icon = 'mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi' desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl." armor = list( ARMOR_MELEE = ARMOR_MELEE_KNIVES, @@ -18,12 +18,12 @@ return FALSE /obj/item/clothing/head/helmet/space/void/skrell/black - icon = 'mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi' + icon = 'mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi' /obj/item/clothing/head/helmet/skrell name = "skrellian helmet" desc = "A helmet built for use by a Skrell. This one appears to be fairly standard and reliable." - icon = 'mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi' + icon = 'mods/species/skrell/icons/clothing/head/helmet_skrell.dmi' /obj/item/clothing/head/helmet/skrell/mob_can_equip(mob/user, slot, disable_warning = FALSE, force = FALSE, ignore_equipped = FALSE) . = ..() diff --git a/mods/species/bayliens/skrell/gear/gear_mask.dm b/mods/species/skrell/gear/gear_mask.dm similarity index 90% rename from mods/species/bayliens/skrell/gear/gear_mask.dm rename to mods/species/skrell/gear/gear_mask.dm index 1d14f847fd5c..c28f99aa4871 100644 --- a/mods/species/bayliens/skrell/gear/gear_mask.dm +++ b/mods/species/skrell/gear/gear_mask.dm @@ -7,7 +7,7 @@ /obj/item/clothing/mask/gas/skrell name = "skrellian gill cover" desc = "A comfy technological piece used typically by those suffering from gill-related disorders. It goes around the neck and shoulders with a small water tank on the back, featuring a hookup for oxytanks to keep the water oxygenated." - icon = 'mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi' + icon = 'mods/species/skrell/icons/clothing/mask/gill_cover.dmi' flags_inv = 0 body_parts_covered = 0 diff --git a/mods/species/bayliens/skrell/gear/gear_rig.dm b/mods/species/skrell/gear/gear_rig.dm similarity index 80% rename from mods/species/bayliens/skrell/gear/gear_rig.dm rename to mods/species/skrell/gear/gear_rig.dm index 0272c6797448..ed16f4d45e79 100644 --- a/mods/species/bayliens/skrell/gear/gear_rig.dm +++ b/mods/species/skrell/gear/gear_rig.dm @@ -2,7 +2,7 @@ /obj/item/rig/skrell name = "skrellian recon hardsuit control module" desc = "A powerful recon hardsuit with integrated power supply and atmosphere. Its impressive design perfectly tailors to the user's body." - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/rig.dmi' suit_type = "recon hardsuit" armor = list( ARMOR_MELEE = ARMOR_MELEE_RESISTANT, @@ -41,20 +41,20 @@ // req_access = list("ACCESS_SKRELLSCOUT") /obj/item/clothing/head/helmet/space/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/boots.dmi' /obj/item/clothing/gloves/rig/skrell - icon = 'mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/standard/gloves.dmi' siemens_coefficient = 0 //Skrell Engineering Suit /obj/item/rig/skrell/eng name = "skrellian engineering hardsuit" desc = "A highly sophisticated, cutting-edge engineering hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/rig.dmi' suit_type = "engineering hardsuit" chest = /obj/item/clothing/suit/space/rig/skrell/eng helmet = /obj/item/clothing/head/helmet/space/rig/skrell/eng @@ -73,20 +73,20 @@ ) /obj/item/clothing/head/helmet/space/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/boots.dmi' /obj/item/clothing/gloves/rig/skrell/eng - icon = 'mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/engineering/gloves.dmi' //Skrell Medical Suit /obj/item/rig/skrell/med name = "skrellian medical hardsuit" desc = "A highly sophisticated, cutting-edge medical hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/rig.dmi' initial_modules = list( /obj/item/rig_module/vision, /obj/item/rig_module/chem_dispenser/injector, @@ -103,19 +103,19 @@ gloves = /obj/item/clothing/gloves/rig/skrell/med /obj/item/clothing/head/helmet/space/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/boots.dmi' /obj/item/clothing/gloves/rig/skrell/med - icon = 'mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/medical/gloves.dmi' //Skrell Combat Suit /obj/item/rig/skrell/sec name = "skrellian combat hardsuit" desc = "A highly sophisticated, cutting-edge combat hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body" - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/rig.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_AP, @@ -139,19 +139,19 @@ gloves = /obj/item/clothing/gloves/rig/skrell/sec /obj/item/clothing/head/helmet/space/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/boots.dmi' /obj/item/clothing/gloves/rig/skrell/sec - icon = 'mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/combat/gloves.dmi' //Skrell Command Suit /obj/item/rig/skrell/cmd name = "skrellian command hardsuit" desc = "A highly sophisticated, cutting-edge hardsuit with an integrated power supply and atmosphere. Its impressive design is resistant yet extremely lightweight, perfectly tailoring itself to the user's body. Property of the Qrii'Vuxix" - icon = 'mods/species/bayliens/skrell/icons/rigs/command/rig.dmi' + icon = 'mods/species/skrell/icons/rigs/command/rig.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_MAJOR, ARMOR_BULLET = ARMOR_BALLISTIC_AP, @@ -175,20 +175,20 @@ gloves = /obj/item/clothing/gloves/rig/skrell/cmd /obj/item/clothing/head/helmet/space/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi' + icon = 'mods/species/skrell/icons/rigs/command/helmet.dmi' /obj/item/clothing/suit/space/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/chest.dmi' + icon = 'mods/species/skrell/icons/rigs/command/chest.dmi' /obj/item/clothing/shoes/magboots/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/boots.dmi' + icon = 'mods/species/skrell/icons/rigs/command/boots.dmi' /obj/item/clothing/gloves/rig/skrell/cmd - icon = 'mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi' + icon = 'mods/species/skrell/icons/rigs/command/gloves.dmi' /obj/item/rig_module/device/clustertool/skrell name = "skrellian clustertool" desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." interface_name = "modular clustertool" interface_desc = "A complex assembly of self-guiding, modular heads capable of performing most manual tasks." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "clustertool" engage_string = "Select Mode" device = /obj/item/clustertool @@ -208,7 +208,7 @@ interface_name = "multitool" interface_desc = "A limited-sentience integrated multitool capable of interfacing with any number of systems." device = /obj/item/multitool/ - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "multitool" usable = FALSE selectable = TRUE @@ -225,7 +225,7 @@ interface_name = "cable fabricator" interface_desc = "A cable nanofabricator of Skrellian design." device = /obj/item/stack/cable_coil/fabricator - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "cablecoil" usable = FALSE selectable = TRUE @@ -235,7 +235,7 @@ desc = "An electrical cutting torch of Skrellian design." interface_name = "welding arm" interface_desc = "An electrical cutting torch of Skrellian design." - icon = 'mods/species/bayliens/skrell/icons/gear/gear_rig.dmi' + icon = 'mods/species/skrell/icons/gear/gear_rig.dmi' icon_state = "welder1" engage_string = "Toggle Welder" device = /obj/item/weldingtool/electric diff --git a/mods/species/bayliens/skrell/gear/gear_suit.dm b/mods/species/skrell/gear/gear_suit.dm similarity index 83% rename from mods/species/bayliens/skrell/gear/gear_suit.dm rename to mods/species/skrell/gear/gear_suit.dm index 891da81aa2db..f9b5947f421d 100644 --- a/mods/species/bayliens/skrell/gear/gear_suit.dm +++ b/mods/species/skrell/gear/gear_suit.dm @@ -1,6 +1,6 @@ /obj/item/clothing/suit/space/void/skrell name = "Skrellian voidsuit" - icon = 'mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi' + icon = 'mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi' desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic." allowed = list( /obj/item/rcd, @@ -23,4 +23,4 @@ flags_inv = HIDEJUMPSUIT /obj/item/clothing/suit/space/void/skrell/black - icon = 'mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi' \ No newline at end of file + icon = 'mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi' \ No newline at end of file diff --git a/mods/species/bayliens/skrell/gear/gear_under.dm b/mods/species/skrell/gear/gear_under.dm similarity index 73% rename from mods/species/bayliens/skrell/gear/gear_under.dm rename to mods/species/skrell/gear/gear_under.dm index e2ee16307dc2..5a194a14ac40 100644 --- a/mods/species/bayliens/skrell/gear/gear_under.dm +++ b/mods/species/skrell/gear/gear_under.dm @@ -1,4 +1,4 @@ /obj/item/clothing/jumpsuit/skrell name = "black bodysuit" desc = "A sleek, skin-tight bodysuit designed to not wick moisture away from the body. The inner stitching appears to contain something written in Skrellian." - icon = 'mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi' + icon = 'mods/species/skrell/icons/clothing/under/skrell_uniform.dmi' diff --git a/mods/species/bayliens/skrell/icons/body/body.dmi b/mods/species/skrell/icons/body/body.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/body.dmi rename to mods/species/skrell/icons/body/body.dmi diff --git a/mods/species/bayliens/skrell/icons/body/eyes.dmi b/mods/species/skrell/icons/body/eyes.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/eyes.dmi rename to mods/species/skrell/icons/body/eyes.dmi diff --git a/mods/species/bayliens/skrell/icons/body/hair.dmi b/mods/species/skrell/icons/body/hair.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/hair.dmi rename to mods/species/skrell/icons/body/hair.dmi diff --git a/mods/species/bayliens/skrell/icons/body/organs.dmi b/mods/species/skrell/icons/body/organs.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/organs.dmi rename to mods/species/skrell/icons/body/organs.dmi diff --git a/mods/species/bayliens/skrell/icons/body/preview.dmi b/mods/species/skrell/icons/body/preview.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/body/preview.dmi rename to mods/species/skrell/icons/body/preview.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_badge.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_badge.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_badge.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_badge.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_blank.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_blank.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_blank.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_blank.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_vuxix.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi b/mods/species/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi rename to mods/species/skrell/icons/clothing/accessories/obj_skrell_zuumqix.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/band.dmi b/mods/species/skrell/icons/clothing/ears/band.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/band.dmi rename to mods/species/skrell/icons/clothing/ears/band.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi b/mods/species/skrell/icons/clothing/ears/chains_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_long.dmi rename to mods/species/skrell/icons/clothing/ears/chains_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi b/mods/species/skrell/icons/clothing/ears/chains_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_short.dmi rename to mods/species/skrell/icons/clothing/ears/chains_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi b/mods/species/skrell/icons/clothing/ears/chains_very_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_very_long.dmi rename to mods/species/skrell/icons/clothing/ears/chains_very_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi b/mods/species/skrell/icons/clothing/ears/chains_very_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/chains_very_short.dmi rename to mods/species/skrell/icons/clothing/ears/chains_very_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi b/mods/species/skrell/icons/clothing/ears/cloth_long.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/cloth_long.dmi rename to mods/species/skrell/icons/clothing/ears/cloth_long.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi b/mods/species/skrell/icons/clothing/ears/cloth_short.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/ears/cloth_short.dmi rename to mods/species/skrell/icons/clothing/ears/cloth_short.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi b/mods/species/skrell/icons/clothing/head/helmet_skrell.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/helmet_skrell.dmi rename to mods/species/skrell/icons/clothing/head/helmet_skrell.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi b/mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_black.dmi rename to mods/species/skrell/icons/clothing/head/skrell_helmet_black.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi b/mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/head/skrell_helmet_white.dmi rename to mods/species/skrell/icons/clothing/head/skrell_helmet_white.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi b/mods/species/skrell/icons/clothing/mask/gill_cover.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/mask/gill_cover.dmi rename to mods/species/skrell/icons/clothing/mask/gill_cover.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi b/mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_black.dmi rename to mods/species/skrell/icons/clothing/suit/skrell_suit_black.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi b/mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/suit/skrell_suit_white.dmi rename to mods/species/skrell/icons/clothing/suit/skrell_suit_white.dmi diff --git a/mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi b/mods/species/skrell/icons/clothing/under/skrell_uniform.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/clothing/under/skrell_uniform.dmi rename to mods/species/skrell/icons/clothing/under/skrell_uniform.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/ammo_unused.dmi b/mods/species/skrell/icons/gear/ammo_unused.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/ammo_unused.dmi rename to mods/species/skrell/icons/gear/ammo_unused.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/e_shield.dmi b/mods/species/skrell/icons/gear/e_shield.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/e_shield.dmi rename to mods/species/skrell/icons/gear/e_shield.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/gear.dmi b/mods/species/skrell/icons/gear/gear.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/gear.dmi rename to mods/species/skrell/icons/gear/gear.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/gear_rig.dmi b/mods/species/skrell/icons/gear/gear_rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/gear_rig.dmi rename to mods/species/skrell/icons/gear/gear_rig.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi b/mods/species/skrell/icons/gear/skrell_carbine.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_carbine.dmi rename to mods/species/skrell/icons/gear/skrell_carbine.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi b/mods/species/skrell/icons/gear/skrell_pistol.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_pistol.dmi rename to mods/species/skrell/icons/gear/skrell_pistol.dmi diff --git a/mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi b/mods/species/skrell/icons/gear/skrell_rifle.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/gear/skrell_rifle.dmi rename to mods/species/skrell/icons/gear/skrell_rifle.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi b/mods/species/skrell/icons/rigs/combat/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/boots.dmi rename to mods/species/skrell/icons/rigs/combat/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi b/mods/species/skrell/icons/rigs/combat/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/chest.dmi rename to mods/species/skrell/icons/rigs/combat/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi b/mods/species/skrell/icons/rigs/combat/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/gloves.dmi rename to mods/species/skrell/icons/rigs/combat/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi b/mods/species/skrell/icons/rigs/combat/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/helmet.dmi rename to mods/species/skrell/icons/rigs/combat/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi b/mods/species/skrell/icons/rigs/combat/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/combat/rig.dmi rename to mods/species/skrell/icons/rigs/combat/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/boots.dmi b/mods/species/skrell/icons/rigs/command/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/boots.dmi rename to mods/species/skrell/icons/rigs/command/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/chest.dmi b/mods/species/skrell/icons/rigs/command/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/chest.dmi rename to mods/species/skrell/icons/rigs/command/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi b/mods/species/skrell/icons/rigs/command/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/gloves.dmi rename to mods/species/skrell/icons/rigs/command/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi b/mods/species/skrell/icons/rigs/command/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/helmet.dmi rename to mods/species/skrell/icons/rigs/command/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/command/rig.dmi b/mods/species/skrell/icons/rigs/command/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/command/rig.dmi rename to mods/species/skrell/icons/rigs/command/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi b/mods/species/skrell/icons/rigs/engineering/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/boots.dmi rename to mods/species/skrell/icons/rigs/engineering/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi b/mods/species/skrell/icons/rigs/engineering/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/chest.dmi rename to mods/species/skrell/icons/rigs/engineering/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi b/mods/species/skrell/icons/rigs/engineering/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/gloves.dmi rename to mods/species/skrell/icons/rigs/engineering/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi b/mods/species/skrell/icons/rigs/engineering/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/helmet.dmi rename to mods/species/skrell/icons/rigs/engineering/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi b/mods/species/skrell/icons/rigs/engineering/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/engineering/rig.dmi rename to mods/species/skrell/icons/rigs/engineering/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi b/mods/species/skrell/icons/rigs/medical/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/boots.dmi rename to mods/species/skrell/icons/rigs/medical/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi b/mods/species/skrell/icons/rigs/medical/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/chest.dmi rename to mods/species/skrell/icons/rigs/medical/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi b/mods/species/skrell/icons/rigs/medical/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/gloves.dmi rename to mods/species/skrell/icons/rigs/medical/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi b/mods/species/skrell/icons/rigs/medical/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/helmet.dmi rename to mods/species/skrell/icons/rigs/medical/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi b/mods/species/skrell/icons/rigs/medical/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/medical/rig.dmi rename to mods/species/skrell/icons/rigs/medical/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi b/mods/species/skrell/icons/rigs/standard/boots.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/boots.dmi rename to mods/species/skrell/icons/rigs/standard/boots.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi b/mods/species/skrell/icons/rigs/standard/chest.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/chest.dmi rename to mods/species/skrell/icons/rigs/standard/chest.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi b/mods/species/skrell/icons/rigs/standard/gloves.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/gloves.dmi rename to mods/species/skrell/icons/rigs/standard/gloves.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi b/mods/species/skrell/icons/rigs/standard/helmet.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/helmet.dmi rename to mods/species/skrell/icons/rigs/standard/helmet.dmi diff --git a/mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi b/mods/species/skrell/icons/rigs/standard/rig.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/rigs/standard/rig.dmi rename to mods/species/skrell/icons/rigs/standard/rig.dmi diff --git a/mods/species/bayliens/skrell/icons/turf/skrellturf.dmi b/mods/species/skrell/icons/turf/skrellturf.dmi similarity index 100% rename from mods/species/bayliens/skrell/icons/turf/skrellturf.dmi rename to mods/species/skrell/icons/turf/skrellturf.dmi diff --git a/mods/species/bayliens/skrell/names/first_name_skrell.txt b/mods/species/skrell/names/first_name_skrell.txt similarity index 100% rename from mods/species/bayliens/skrell/names/first_name_skrell.txt rename to mods/species/skrell/names/first_name_skrell.txt diff --git a/mods/species/bayliens/skrell/names/last_name_skrell.txt b/mods/species/skrell/names/last_name_skrell.txt similarity index 100% rename from mods/species/bayliens/skrell/names/last_name_skrell.txt rename to mods/species/skrell/names/last_name_skrell.txt diff --git a/mods/species/bayliens/skrell/sound/accessory.ogg b/mods/species/skrell/sound/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/accessory.ogg rename to mods/species/skrell/sound/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/drop/accessory.ogg b/mods/species/skrell/sound/drop/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/drop/accessory.ogg rename to mods/species/skrell/sound/drop/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/pickup/accessory.ogg b/mods/species/skrell/sound/pickup/accessory.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/pickup/accessory.ogg rename to mods/species/skrell/sound/pickup/accessory.ogg diff --git a/mods/species/bayliens/skrell/sound/warble.ogg b/mods/species/skrell/sound/warble.ogg similarity index 100% rename from mods/species/bayliens/skrell/sound/warble.ogg rename to mods/species/skrell/sound/warble.ogg diff --git a/mods/species/bayliens/skrell/turfs/flooring.dm b/mods/species/skrell/turfs/flooring.dm similarity index 90% rename from mods/species/bayliens/skrell/turfs/flooring.dm rename to mods/species/skrell/turfs/flooring.dm index 8a35d60d164b..255c64ebb71b 100644 --- a/mods/species/bayliens/skrell/turfs/flooring.dm +++ b/mods/species/skrell/turfs/flooring.dm @@ -1,5 +1,5 @@ /turf/floor/tiled/skrell - icon = 'mods/species/bayliens/skrell/icons/turf/skrellturf.dmi' + icon = 'mods/species/skrell/icons/turf/skrellturf.dmi' icon_state = "skrellblack" _flooring = /decl/flooring/reinforced/shuttle/skrell @@ -26,7 +26,7 @@ ///////////////////////////////////////////////////////////////////////// /decl/flooring/reinforced/shuttle/skrell - icon = 'mods/species/bayliens/skrell/icons/turf/skrellturf.dmi' + icon = 'mods/species/skrell/icons/turf/skrellturf.dmi' icon_base = "skrellblack" /decl/flooring/reinforced/shuttle/skrell/white diff --git a/mods/species/tajaran/_tajaran.dm b/mods/species/tajaran/_tajaran.dm new file mode 100644 index 000000000000..cb92dbfae89c --- /dev/null +++ b/mods/species/tajaran/_tajaran.dm @@ -0,0 +1,24 @@ +#define LANGUAGE_TAJARAN "Siik'maas" +#define SPECIES_TAJARAN "Tajara" +#define BODYTYPE_TAJARAN "felinoid body" + +/decl/modpack/tajaran + name = "Tajaran Species" + tabloid_headlines = list( + "TAJARANS: CUTE AND CUDDLY, OR INFILTRATING THE GOVERNMENT? FIND OUT MORE INSIDE" + ) + +/decl/modpack/tajaran/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_TAJARAN + +/mob/living/human/tajaran/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + . = ..(species_name = SPECIES_TAJARAN) + +/obj/item + var/_tajaran_onmob_icon + +/obj/item/setup_sprite_sheets() + . = ..() + if(_tajaran_onmob_icon) + LAZYSET(sprite_sheets, BODYTYPE_TAJARAN, _tajaran_onmob_icon) diff --git a/mods/species/tajaran/_tajaran.dme b/mods/species/tajaran/_tajaran.dme new file mode 100644 index 000000000000..a1ebf288ceca --- /dev/null +++ b/mods/species/tajaran/_tajaran.dme @@ -0,0 +1,14 @@ +#ifndef MODPACK_SPECIES_TAJARAN +#define MODPACK_SPECIES_TAJARAN +// BEGIN_INCLUDE +#include "_tajaran.dm" +#include "datum\accessory.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\emotes.dm" +#include "datum\language.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "machinery\suit_cycler.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/tajaran/datum/accessory.dm b/mods/species/tajaran/datum/accessory.dm similarity index 96% rename from mods/species/bayliens/tajaran/datum/accessory.dm rename to mods/species/tajaran/datum/accessory.dm index 0aa3121da545..33d858efac46 100644 --- a/mods/species/bayliens/tajaran/datum/accessory.dm +++ b/mods/species/tajaran/datum/accessory.dm @@ -2,8 +2,8 @@ /decl/sprite_accessory/hair/taj name = "Tajaran Rattail" icon_state = "hair_rattail" - species_allowed = list(SPECIES_TAJARA) - icon = 'mods/species/bayliens/tajaran/icons/hair.dmi' + species_allowed = list(SPECIES_TAJARAN) + icon = 'mods/species/tajaran/icons/hair.dmi' color_blend = ICON_MULTIPLY uid = "acc_hair_taj_rattail" @@ -135,8 +135,8 @@ /decl/sprite_accessory/facial_hair/taj name = "Tajaran Sideburns" icon_state = "facial_sideburns" - species_allowed = list(SPECIES_TAJARA) - icon = 'mods/species/bayliens/tajaran/icons/facial.dmi' + species_allowed = list(SPECIES_TAJARAN) + icon = 'mods/species/tajaran/icons/facial.dmi' color_blend = ICON_MULTIPLY uid = "acc_fhair_taj_sideburns" @@ -168,8 +168,8 @@ /decl/sprite_accessory/marking/tajaran name = "Tajaran Nose" icon_state = "nose" - icon = 'mods/species/bayliens/tajaran/icons/markings.dmi' - species_allowed = list(SPECIES_TAJARA) + icon = 'mods/species/tajaran/icons/markings.dmi' + species_allowed = list(SPECIES_TAJARAN) body_parts = list(BP_HEAD) color_blend = ICON_MULTIPLY uid = "acc_marking_taj_nose" diff --git a/mods/species/tajaran/datum/blood.dm b/mods/species/tajaran/datum/blood.dm new file mode 100644 index 000000000000..e993197f5327 --- /dev/null +++ b/mods/species/tajaran/datum/blood.dm @@ -0,0 +1,58 @@ +/decl/blood_type/tajaran + antigen_category = "Tajaran" + splatter_colour = "#862a51" + abstract_type = /decl/blood_type/tajaran + +/decl/blood_type/tajaran/mplus + name = "M+" + antigens = list("M", "Fe") + random_weighting = 28 + +/decl/blood_type/tajaran/mminus + name = "M-" + antigens = list("M") + random_weighting = 3 + +/decl/blood_type/tajaran/rplus + name = "R+" + antigens = list("R", "Fe") + random_weighting = 20 + +/decl/blood_type/tajaran/rminus + name = "R-" + antigens = list("R",) + +/decl/blood_type/tajaran/mrplus + name = "MR+" + antigens = list("M", "R", "Fe") + random_weighting = 5 + +/decl/blood_type/tajaran/mrminus + name = "MR-" + antigens = list("M", "R") + +/decl/blood_type/tajaran/oplus + name = "Of+" + antigens = list("Fe") + random_weighting = 36 + +/decl/blood_type/tajaran/ominus + name = "Of-" + random_weighting = 4 + +/obj/item/chems/ivbag/blood/tajaran_mplus + label_text = "M+" +/obj/item/chems/ivbag/blood/tajaran_mminus + label_text = "M-" +/obj/item/chems/ivbag/blood/tajaran_rplus + label_text = "R+" +/obj/item/chems/ivbag/blood/tajaran_mminus + label_text = "M-" +/obj/item/chems/ivbag/blood/tajaran_mrplus + label_text = "MR+" +/obj/item/chems/ivbag/blood/tajaran_mrminus + label_text = "MR-" +/obj/item/chems/ivbag/blood/tajaran_oplus + label_text = "Of+" +/obj/item/chems/ivbag/blood/tajaran_oplus + label_text = "Of-" diff --git a/mods/species/bayliens/tajaran/datum/culture.dm b/mods/species/tajaran/datum/culture.dm similarity index 100% rename from mods/species/bayliens/tajaran/datum/culture.dm rename to mods/species/tajaran/datum/culture.dm diff --git a/mods/species/bayliens/tajaran/datum/emotes.dm b/mods/species/tajaran/datum/emotes.dm similarity index 53% rename from mods/species/bayliens/tajaran/datum/emotes.dm rename to mods/species/tajaran/datum/emotes.dm index adeed0c5c8d6..9dff98489016 100644 --- a/mods/species/bayliens/tajaran/datum/emotes.dm +++ b/mods/species/tajaran/datum/emotes.dm @@ -1,9 +1,9 @@ /decl/emote/audible/purr key = "purr" emote_message_3p = "$USER$ purrs." - emote_sound = 'mods/species/bayliens/tajaran/sound/cat_purr.ogg' + emote_sound = 'mods/species/tajaran/sound/cat_purr.ogg' /decl/emote/audible/purrlong key = "purrl" emote_message_3p = "$USER$ purrs." - emote_sound = 'mods/species/bayliens/tajaran/sound/cat_purr_long.ogg' + emote_sound = 'mods/species/tajaran/sound/cat_purr_long.ogg' diff --git a/mods/species/bayliens/tajaran/datum/language.dm b/mods/species/tajaran/datum/language.dm similarity index 98% rename from mods/species/bayliens/tajaran/datum/language.dm rename to mods/species/tajaran/datum/language.dm index 08427f4f6344..ae3b42f9293b 100644 --- a/mods/species/bayliens/tajaran/datum/language.dm +++ b/mods/species/tajaran/datum/language.dm @@ -1,5 +1,5 @@ /decl/language/tajaran - name = LANGUAGE_TAJARA + name = LANGUAGE_TAJARAN desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran." speech_verb = "purrs" ask_verb = "purrs" diff --git a/mods/species/bayliens/tajaran/datum/species.dm b/mods/species/tajaran/datum/species.dm similarity index 79% rename from mods/species/bayliens/tajaran/datum/species.dm rename to mods/species/tajaran/datum/species.dm index 19de51ffc360..4feacd90c5b7 100644 --- a/mods/species/bayliens/tajaran/datum/species.dm +++ b/mods/species/tajaran/datum/species.dm @@ -12,13 +12,13 @@ ) /decl/species/tajaran - name = SPECIES_TAJARA + name = SPECIES_TAJARAN name_plural = "Tajaran" base_external_prosthetics_model = null description = "A small mammalian carnivore. If you are reading this, you are probably a Tajaran." hidden_from_codex = FALSE - available_bodytypes = list(/decl/bodytype/feline) + available_bodytypes = list(/decl/bodytype/tajaran) traits = list(/decl/trait/malus/intolerance/caffeine = TRAIT_LEVEL_MAJOR) @@ -27,19 +27,19 @@ spawn_flags = SPECIES_CAN_JOIN blood_types = list( - /decl/blood_type/feline/mplus, - /decl/blood_type/feline/mminus, - /decl/blood_type/feline/rplus, - /decl/blood_type/feline/rminus, - /decl/blood_type/feline/mrplus, - /decl/blood_type/feline/mrminus, - /decl/blood_type/feline/oplus, - /decl/blood_type/feline/ominus + /decl/blood_type/tajaran/mplus, + /decl/blood_type/tajaran/mminus, + /decl/blood_type/tajaran/rplus, + /decl/blood_type/tajaran/rminus, + /decl/blood_type/tajaran/mrplus, + /decl/blood_type/tajaran/mrminus, + /decl/blood_type/tajaran/oplus, + /decl/blood_type/tajaran/ominus ) flesh_color = "#ae7d32" - organs_icon = 'mods/species/bayliens/tajaran/icons/organs.dmi' + organs_icon = 'mods/species/tajaran/icons/organs.dmi' hunger_factor = DEFAULT_HUNGER_FACTOR * 1.2 thirst_factor = DEFAULT_THIRST_FACTOR * 1.2 @@ -72,7 +72,7 @@ "Ñ€" = list("рр", "ррр", "рррр")//thats not "pi" ) - autohiss_exempt = list(LANGUAGE_TAJARA) + autohiss_exempt = list(LANGUAGE_TAJARAN) /decl/species/tajaran/handle_additional_hair_loss(var/mob/living/human/H, var/defer_body_update = TRUE) . = H?.set_skin_colour(rgb(189, 171, 143)) diff --git a/mods/species/bayliens/tajaran/datum/species_bodytypes.dm b/mods/species/tajaran/datum/species_bodytypes.dm similarity index 72% rename from mods/species/bayliens/tajaran/datum/species_bodytypes.dm rename to mods/species/tajaran/datum/species_bodytypes.dm index 0088067d9b28..f2ae05c42dcf 100644 --- a/mods/species/bayliens/tajaran/datum/species_bodytypes.dm +++ b/mods/species/tajaran/datum/species_bodytypes.dm @@ -1,21 +1,21 @@ -/decl/bodytype/feline - name = "humanoid" - bodytype_category = BODYTYPE_FELINE +/decl/bodytype/tajaran + name = "felinoid" + bodytype_category = BODYTYPE_TAJARAN limb_blend = ICON_MULTIPLY - icon_template = 'mods/species/bayliens/tajaran/icons/template.dmi' - icon_base = 'mods/species/bayliens/tajaran/icons/body.dmi' - icon_deformed = 'mods/species/bayliens/tajaran/icons/deformed_body.dmi' + icon_template = 'mods/species/tajaran/icons/template.dmi' + icon_base = 'mods/species/tajaran/icons/body.dmi' + icon_deformed = 'mods/species/tajaran/icons/deformed_body.dmi' bandages_icon = 'icons/mob/bandage.dmi' - skeletal_icon = 'mods/species/bayliens/tajaran/icons/skeleton.dmi' - cosmetics_icon = 'mods/species/bayliens/tajaran/icons/cosmetics.dmi' + skeletal_icon = 'mods/species/tajaran/icons/skeleton.dmi' + cosmetics_icon = 'mods/species/tajaran/icons/cosmetics.dmi' health_hud_intensity = 1.75 - bodytype_flag = BODY_EQUIP_FLAG_FELINE + bodytype_flag = BODY_EQUIP_FLAG_HUMANOID movement_slowdown = -0.5 appearance_flags = HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR base_color = "#ae7d32" base_eye_color = "#00aa00" nail_noun = "claws" - uid = "bodytype_feline" + uid = "bodytype_tajaran" footprints_icon = 'icons/mob/footprints/footprints_paw.dmi' age_descriptor = /datum/appearance_descriptor/age/tajaran @@ -23,7 +23,7 @@ eye_darksight_range = 7 eye_flash_mod = 2 eye_blend = ICON_MULTIPLY - eye_icon = 'mods/species/bayliens/tajaran/icons/eyes.dmi' + eye_icon = 'mods/species/tajaran/icons/eyes.dmi' eye_low_light_vision_effectiveness = 0.15 eye_low_light_vision_adjustment_speed = 0.3 @@ -55,7 +55,7 @@ "Your overheated skin itches." ) -/decl/bodytype/feline/Initialize() +/decl/bodytype/tajaran/Initialize() _equip_adjust = list( (slot_glasses_str) = list( "[NORTH]" = list(0, 2), @@ -78,7 +78,7 @@ ) . = ..() -/decl/bodytype/feline/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) +/decl/bodytype/tajaran/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) if(tool?.grooming_flags & GROOMABLE_BRUSH) return list( "success" = GROOMING_RESULT_SUCCESS, @@ -87,6 +87,6 @@ return ..() /obj/item/organ/external/tail/cat - tail_icon = 'mods/species/bayliens/tajaran/icons/tail.dmi' + tail_icon = 'mods/species/tajaran/icons/tail.dmi' tail_blend = ICON_MULTIPLY tail_animation_states = 1 diff --git a/mods/species/bayliens/tajaran/icons/body.dmi b/mods/species/tajaran/icons/body.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/body.dmi rename to mods/species/tajaran/icons/body.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi b/mods/species/tajaran/icons/clothing/atmos/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/atmos/suit.dmi rename to mods/species/tajaran/icons/clothing/atmos/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi b/mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/atmos_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi b/mods/species/tajaran/icons/clothing/deathsquad/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/deathsquad/suit.dmi rename to mods/species/tajaran/icons/clothing/deathsquad/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi b/mods/species/tajaran/icons/clothing/engineering/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/engineering/suit.dmi rename to mods/species/tajaran/icons/clothing/engineering/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi b/mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/engineering_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi b/mods/species/tajaran/icons/clothing/excavation/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/excavation/suit.dmi rename to mods/species/tajaran/icons/clothing/excavation/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi b/mods/species/tajaran/icons/clothing/medical/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/medical/suit.dmi rename to mods/species/tajaran/icons/clothing/medical/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi b/mods/species/tajaran/icons/clothing/medical_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/medical_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/medical_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi b/mods/species/tajaran/icons/clothing/merc/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/merc/suit.dmi rename to mods/species/tajaran/icons/clothing/merc/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi b/mods/species/tajaran/icons/clothing/mining/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/mining/suit.dmi rename to mods/species/tajaran/icons/clothing/mining/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi b/mods/species/tajaran/icons/clothing/mining_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/mining_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/mining_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi b/mods/species/tajaran/icons/clothing/nasa/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/nasa/suit.dmi rename to mods/species/tajaran/icons/clothing/nasa/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi b/mods/species/tajaran/icons/clothing/pilot/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/pilot/suit.dmi rename to mods/species/tajaran/icons/clothing/pilot/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi b/mods/species/tajaran/icons/clothing/salvage/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/salvage/suit.dmi rename to mods/species/tajaran/icons/clothing/salvage/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi b/mods/species/tajaran/icons/clothing/sec/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/sec/suit.dmi rename to mods/species/tajaran/icons/clothing/sec/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi b/mods/species/tajaran/icons/clothing/sec_alt/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/sec_alt/suit.dmi rename to mods/species/tajaran/icons/clothing/sec_alt/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/clothing/wizard/suit.dmi b/mods/species/tajaran/icons/clothing/wizard/suit.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/clothing/wizard/suit.dmi rename to mods/species/tajaran/icons/clothing/wizard/suit.dmi diff --git a/mods/species/bayliens/tajaran/icons/cosmetics.dmi b/mods/species/tajaran/icons/cosmetics.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/cosmetics.dmi rename to mods/species/tajaran/icons/cosmetics.dmi diff --git a/mods/species/bayliens/tajaran/icons/deformed_body.dmi b/mods/species/tajaran/icons/deformed_body.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/deformed_body.dmi rename to mods/species/tajaran/icons/deformed_body.dmi diff --git a/mods/species/bayliens/tajaran/icons/eyes.dmi b/mods/species/tajaran/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/eyes.dmi rename to mods/species/tajaran/icons/eyes.dmi diff --git a/mods/species/bayliens/tajaran/icons/facial.dmi b/mods/species/tajaran/icons/facial.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/facial.dmi rename to mods/species/tajaran/icons/facial.dmi diff --git a/mods/species/bayliens/tajaran/icons/hair.dmi b/mods/species/tajaran/icons/hair.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/hair.dmi rename to mods/species/tajaran/icons/hair.dmi diff --git a/mods/species/bayliens/tajaran/icons/markings.dmi b/mods/species/tajaran/icons/markings.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/markings.dmi rename to mods/species/tajaran/icons/markings.dmi diff --git a/mods/species/bayliens/tajaran/icons/markings_old.dmi b/mods/species/tajaran/icons/markings_old.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/markings_old.dmi rename to mods/species/tajaran/icons/markings_old.dmi diff --git a/mods/species/bayliens/tajaran/icons/organs.dmi b/mods/species/tajaran/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/organs.dmi rename to mods/species/tajaran/icons/organs.dmi diff --git a/mods/species/bayliens/tajaran/icons/skeleton.dmi b/mods/species/tajaran/icons/skeleton.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/skeleton.dmi rename to mods/species/tajaran/icons/skeleton.dmi diff --git a/mods/species/bayliens/tajaran/icons/tail.dmi b/mods/species/tajaran/icons/tail.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/tail.dmi rename to mods/species/tajaran/icons/tail.dmi diff --git a/mods/species/bayliens/tajaran/icons/template.dmi b/mods/species/tajaran/icons/template.dmi similarity index 100% rename from mods/species/bayliens/tajaran/icons/template.dmi rename to mods/species/tajaran/icons/template.dmi diff --git a/mods/species/tajaran/machinery/suit_cycler.dm b/mods/species/tajaran/machinery/suit_cycler.dm new file mode 100644 index 000000000000..44be03d5588e --- /dev/null +++ b/mods/species/tajaran/machinery/suit_cycler.dm @@ -0,0 +1,52 @@ +/obj/machinery/suit_cycler/Initialize() + LAZYDISTINCTADD(available_bodytypes, BODYTYPE_TAJARAN) + . = ..() + +/obj/item/clothing/suit/space/void/merc + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/merc/suit.dmi' + +/obj/item/clothing/suit/space/void/swat + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/deathsquad/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/engineering/suit.dmi' + +/obj/item/clothing/suit/space/void/mining + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/mining/suit.dmi' + +/obj/item/clothing/suit/space/void/medical + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/medical/suit.dmi' + +/obj/item/clothing/suit/space/void/security + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/sec/suit.dmi' + +/obj/item/clothing/suit/space/void/atmos + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/atmos/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/engineering_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/mining/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/mining_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/medical/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/medical_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/security/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/sec_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/atmos/alt + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/atmos_alt/suit.dmi' + +/obj/item/clothing/suit/space/void/engineering/salvage + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/salvage/suit.dmi' + +/obj/item/clothing/suit/space/void/expedition + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/pilot/suit.dmi' + +/obj/item/clothing/suit/space/void + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/nasa/suit.dmi' + + +/obj/item/clothing/suit/space/void/excavation + _tajaran_onmob_icon = 'mods/species/tajaran/icons/clothing/excavation/suit.dmi' diff --git a/mods/species/bayliens/tajaran/sound/cat_purr.ogg b/mods/species/tajaran/sound/cat_purr.ogg similarity index 100% rename from mods/species/bayliens/tajaran/sound/cat_purr.ogg rename to mods/species/tajaran/sound/cat_purr.ogg diff --git a/mods/species/bayliens/tajaran/sound/cat_purr_long.ogg b/mods/species/tajaran/sound/cat_purr_long.ogg similarity index 100% rename from mods/species/bayliens/tajaran/sound/cat_purr_long.ogg rename to mods/species/tajaran/sound/cat_purr_long.ogg diff --git a/mods/species/tritonian/_tritonian.dm b/mods/species/tritonian/_tritonian.dm new file mode 100644 index 000000000000..5b8b6ad2a6c7 --- /dev/null +++ b/mods/species/tritonian/_tritonian.dm @@ -0,0 +1,4 @@ +#define SPECIES_TRITONIAN "Tritonian" + +/decl/modpack/tritonians + name = "Tritonian Species" \ No newline at end of file diff --git a/mods/species/tritonian/_tritonian.dme b/mods/species/tritonian/_tritonian.dme new file mode 100644 index 000000000000..b1f286a9dd84 --- /dev/null +++ b/mods/species/tritonian/_tritonian.dme @@ -0,0 +1,8 @@ +#ifndef MODPACK_TRITONIAN_SPECIES +#define MODPACK_TRITONIAN_SPECIES +// BEGIN_INCLUDE +#include "_tritonian.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/tritonian/datum/species.dm b/mods/species/tritonian/datum/species.dm similarity index 100% rename from mods/species/bayliens/tritonian/datum/species.dm rename to mods/species/tritonian/datum/species.dm diff --git a/mods/species/bayliens/tritonian/datum/species_bodytypes.dm b/mods/species/tritonian/datum/species_bodytypes.dm similarity index 84% rename from mods/species/bayliens/tritonian/datum/species_bodytypes.dm rename to mods/species/tritonian/datum/species_bodytypes.dm index dadaac398a3d..9ee6c55a8039 100644 --- a/mods/species/bayliens/tritonian/datum/species_bodytypes.dm +++ b/mods/species/tritonian/datum/species_bodytypes.dm @@ -1,5 +1,5 @@ /decl/bodytype/human/tritonian - icon_base = 'mods/species/bayliens/tritonian/icons/body_female.dmi' + icon_base = 'mods/species/tritonian/icons/body_female.dmi' movement_slowdown = 0.5 appearance_flags = HAS_SKIN_TONE_TRITON | HAS_UNDERWEAR | HAS_EYE_COLOR uid = "bodytype_tritonian_fem" @@ -12,7 +12,7 @@ /decl/bodytype/human/tritonian/masculine name = "masculine" - icon_base = 'mods/species/bayliens/tritonian/icons/body_male.dmi' + icon_base = 'mods/species/tritonian/icons/body_male.dmi' icon_deformed = 'icons/mob/human_races/species/human/deformed_body_male.dmi' associated_gender = MALE onmob_state_modifiers = null diff --git a/mods/species/bayliens/tritonian/icons/body_female.dmi b/mods/species/tritonian/icons/body_female.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/body_female.dmi rename to mods/species/tritonian/icons/body_female.dmi diff --git a/mods/species/bayliens/tritonian/icons/body_male.dmi b/mods/species/tritonian/icons/body_male.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/body_male.dmi rename to mods/species/tritonian/icons/body_male.dmi diff --git a/mods/species/bayliens/tritonian/icons/tritonian_preview.dmi b/mods/species/tritonian/icons/tritonian_preview.dmi similarity index 100% rename from mods/species/bayliens/tritonian/icons/tritonian_preview.dmi rename to mods/species/tritonian/icons/tritonian_preview.dmi diff --git a/mods/species/unathi/_unathi.dm b/mods/species/unathi/_unathi.dm new file mode 100644 index 000000000000..9815aeceb09c --- /dev/null +++ b/mods/species/unathi/_unathi.dm @@ -0,0 +1,18 @@ +#define SPECIES_UNATHI "Unathi" +#define LANGUAGE_LIZARD "Sinta'unathi" + +/decl/modpack/unathi + name = "Unathi Species" + tabloid_headlines = list( + "SHOCKING FIGURES REVEAL MORE TEENS DIE TO UNATHI HONOUR DUELS THAN GUN VIOLENCE", + "LOCAL UNATHI SYMPATHIZER: 'I really think you should stop with these spacebaiting articles.'", + "DO UNATHI SYMPATHIZERS HATE THE HUMAN RACE?" + ) + +/decl/modpack/unathi/pre_initialize() + ..() + SSmodpacks.default_submap_whitelisted_species |= SPECIES_UNATHI + +/mob/living/human/unathi/Initialize(mapload, species_name, datum/mob_snapshot/supplied_appearance) + species_name = SPECIES_UNATHI + . = ..() diff --git a/mods/species/unathi/_unathi.dme b/mods/species/unathi/_unathi.dme new file mode 100644 index 000000000000..175b179346b6 --- /dev/null +++ b/mods/species/unathi/_unathi.dme @@ -0,0 +1,14 @@ +#ifndef MODPACK_SPECIES_UNATHI +#define MODPACK_SPECIES_UNATHI +// BEGIN_INCLUDE +#include "_unathi.dm" +#include "datum\autohiss.dm" +#include "datum\blood.dm" +#include "datum\culture.dm" +#include "datum\language.dm" +#include "datum\species.dm" +#include "datum\species_bodytypes.dm" +#include "datum\sprite_accessory.dm" +#include "organs\organs_internal.dm" +// END_INCLUDE +#endif diff --git a/mods/species/bayliens/unathi/datum/autohiss.dm b/mods/species/unathi/datum/autohiss.dm similarity index 100% rename from mods/species/bayliens/unathi/datum/autohiss.dm rename to mods/species/unathi/datum/autohiss.dm diff --git a/mods/species/bayliens/unathi/datum/blood.dm b/mods/species/unathi/datum/blood.dm similarity index 100% rename from mods/species/bayliens/unathi/datum/blood.dm rename to mods/species/unathi/datum/blood.dm diff --git a/mods/species/bayliens/unathi/datum/culture.dm b/mods/species/unathi/datum/culture.dm similarity index 83% rename from mods/species/bayliens/unathi/datum/culture.dm rename to mods/species/unathi/datum/culture.dm index 0c1101d09e0b..4087e19f3c08 100644 --- a/mods/species/bayliens/unathi/datum/culture.dm +++ b/mods/species/unathi/datum/culture.dm @@ -1,8 +1,8 @@ -/decl/background_detail/heritage/lizard +/decl/background_detail/heritage/unathi name = "Lizard Culture" description = "The humanoid race of reptiles was able to successfully adapt to life in space. \ Despite the fact that these creatures are sensitive to cold, they have a number of fighting qualities that have evolved over their long evolved life." - language = /decl/language/lizard + language = /decl/language/unathi secondary_langs = list( /decl/language/human/common, /decl/language/sign diff --git a/mods/species/bayliens/unathi/datum/language.dm b/mods/species/unathi/datum/language.dm similarity index 97% rename from mods/species/bayliens/unathi/datum/language.dm rename to mods/species/unathi/datum/language.dm index f14b8b486ce8..e302d2208217 100644 --- a/mods/species/bayliens/unathi/datum/language.dm +++ b/mods/species/unathi/datum/language.dm @@ -1,4 +1,4 @@ -/decl/language/lizard +/decl/language/unathi name = LANGUAGE_LIZARD desc = "The common language of Lizards, composed of sibilant hisses and rattles. Hiss!" speech_verb = "hisses" diff --git a/mods/species/bayliens/unathi/datum/species.dm b/mods/species/unathi/datum/species.dm similarity index 87% rename from mods/species/bayliens/unathi/datum/species.dm rename to mods/species/unathi/datum/species.dm index ad4a508329bd..aa7e32e0efb3 100644 --- a/mods/species/bayliens/unathi/datum/species.dm +++ b/mods/species/unathi/datum/species.dm @@ -1,4 +1,4 @@ -/datum/appearance_descriptor/age/lizard +/datum/appearance_descriptor/age/unathi standalone_value_descriptors = list( "an infant" = 1, "a toddler" = 3, @@ -16,13 +16,13 @@ skin_material = /decl/material/solid/organic/skin/lizard /decl/species/unathi - name = SPECIES_LIZARD - name_plural = SPECIES_LIZARD + name = SPECIES_UNATHI + name_plural = SPECIES_UNATHI butchery_data = /decl/butchery_data/humanoid/unathi available_bodytypes = list( - /decl/bodytype/lizard, - /decl/bodytype/lizard/masculine + /decl/bodytype/unathi, + /decl/bodytype/unathi/masculine ) available_accessory_categories = list( @@ -51,7 +51,7 @@ spawn_flags = SPECIES_CAN_JOIN | SPECIES_NO_ROBOTIC_INTERNAL_ORGANS flesh_color = "#34af10" - organs_icon = 'mods/species/bayliens/unathi/icons/organs.dmi' + organs_icon = 'mods/species/unathi/icons/organs.dmi' preview_outfit = /decl/outfit/job/generic/doctor @@ -67,7 +67,7 @@ ) move_trail = /obj/effect/decal/cleanable/blood/tracks/claw - breathing_sound = 'mods/species/bayliens/unathi/sound/lizard_breathing.ogg' + breathing_sound = 'mods/species/unathi/sound/lizard_breathing.ogg' default_emotes = list( /decl/emote/visible/tail/swish, @@ -98,8 +98,8 @@ /decl/species/unathi/Initialize() . = ..() LAZYINITLIST(available_background_info) - LAZYDISTINCTADD(available_background_info[/decl/background_category/heritage], /decl/background_detail/heritage/lizard) - LAZYSET(default_background_info, /decl/background_category/heritage, /decl/background_detail/heritage/lizard) + LAZYDISTINCTADD(available_background_info[/decl/background_category/heritage], /decl/background_detail/heritage/unathi) + LAZYSET(default_background_info, /decl/background_category/heritage, /decl/background_detail/heritage/unathi) /decl/species/unathi/equip_survival_gear(var/mob/living/human/H) ..() diff --git a/mods/species/bayliens/unathi/datum/species_bodytypes.dm b/mods/species/unathi/datum/species_bodytypes.dm similarity index 66% rename from mods/species/bayliens/unathi/datum/species_bodytypes.dm rename to mods/species/unathi/datum/species_bodytypes.dm index 226241bc9a1a..1cf2fe31d668 100644 --- a/mods/species/bayliens/unathi/datum/species_bodytypes.dm +++ b/mods/species/unathi/datum/species_bodytypes.dm @@ -1,10 +1,10 @@ -/decl/bodytype/lizard +/decl/bodytype/unathi name = "feminine" bodytype_category = BODYTYPE_HUMANOID - husk_icon = 'mods/species/bayliens/unathi/icons/husk.dmi' - icon_base = 'mods/species/bayliens/unathi/icons/body_female.dmi' - icon_deformed = 'mods/species/bayliens/unathi/icons/deformed_body_female.dmi' - cosmetics_icon = 'mods/species/bayliens/unathi/icons/cosmetics.dmi' + husk_icon = 'mods/species/unathi/icons/husk.dmi' + icon_base = 'mods/species/unathi/icons/body_female.dmi' + icon_deformed = 'mods/species/unathi/icons/deformed_body_female.dmi' + cosmetics_icon = 'mods/species/unathi/icons/cosmetics.dmi' blood_overlays = 'icons/mob/human_races/species/human/blood_overlays.dmi' bandages_icon = 'icons/mob/bandage.dmi' limb_icon_intensity = 0.7 @@ -18,13 +18,13 @@ eye_flash_mod = 1.2 nail_noun = "claws" uid = "bodytype_unathi_fem" - footprints_icon = 'mods/species/bayliens/unathi/icons/footprints.dmi' + footprints_icon = 'mods/species/unathi/icons/footprints.dmi' - age_descriptor = /datum/appearance_descriptor/age/lizard + age_descriptor = /datum/appearance_descriptor/age/unathi default_sprite_accessories = list( SAC_FRILLS = list( - /decl/sprite_accessory/frills/lizard/frills_long = list(SAM_COLOR = "#192e19") + /decl/sprite_accessory/frills/unathi/frills_long = list(SAM_COLOR = "#192e19") ) ) @@ -34,12 +34,12 @@ ) override_organ_types = list( - BP_EYES = /obj/item/organ/internal/eyes/lizard, - BP_BRAIN = /obj/item/organ/internal/brain/lizard + BP_EYES = /obj/item/organ/internal/eyes/unathi, + BP_BRAIN = /obj/item/organ/internal/brain/unathi ) override_limb_types = list( - BP_TAIL = /obj/item/organ/external/tail/lizard, + BP_TAIL = /obj/item/organ/external/tail/unathi, BP_HEAD = /obj/item/organ/external/head/strong_bite, BP_L_HAND = /obj/item/organ/external/hand/clawed, BP_R_HAND = /obj/item/organ/external/hand/right/clawed @@ -67,7 +67,7 @@ "Your scales bristle against the cold." ) -/decl/bodytype/lizard/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) +/decl/bodytype/unathi/get_default_grooming_results(obj/item/organ/external/limb, obj/item/grooming/tool) if(tool?.grooming_flags & GROOMABLE_FILE) return list( "success" = GROOMING_RESULT_SUCCESS, @@ -75,18 +75,18 @@ ) return ..() -/decl/bodytype/lizard/masculine +/decl/bodytype/unathi/masculine name = "masculine" - icon_base = 'mods/species/bayliens/unathi/icons/body_male.dmi' - icon_deformed = 'mods/species/bayliens/unathi/icons/deformed_body_male.dmi' + icon_base = 'mods/species/unathi/icons/body_male.dmi' + icon_deformed = 'mods/species/unathi/icons/deformed_body_male.dmi' associated_gender = MALE onmob_state_modifiers = null uid = "bodytype_unathi_masc" -/obj/item/organ/external/tail/lizard - tail_icon = 'mods/species/bayliens/unathi/icons/tail.dmi' +/obj/item/organ/external/tail/unathi + tail_icon = 'mods/species/unathi/icons/tail.dmi' tail_animation_states = 9 -/obj/item/organ/external/tail/lizard/get_natural_attacks() +/obj/item/organ/external/tail/unathi/get_natural_attacks() var/static/unarmed_attack = GET_DECL(/decl/natural_attack/tail) return unarmed_attack diff --git a/mods/species/bayliens/unathi/datum/sprite_accessory.dm b/mods/species/unathi/datum/sprite_accessory.dm similarity index 63% rename from mods/species/bayliens/unathi/datum/sprite_accessory.dm rename to mods/species/unathi/datum/sprite_accessory.dm index 910761195dd9..bc102edebe41 100644 --- a/mods/species/bayliens/unathi/datum/sprite_accessory.dm +++ b/mods/species/unathi/datum/sprite_accessory.dm @@ -1,112 +1,112 @@ -/decl/sprite_accessory/horns/lizard +/decl/sprite_accessory/horns/unathi name = "Lizard Horns" - icon = 'mods/species/bayliens/unathi/icons/horns.dmi' + icon = 'mods/species/unathi/icons/horns.dmi' icon_state = "horns" - species_allowed = list(SPECIES_LIZARD) + species_allowed = list(SPECIES_UNATHI) color_blend = ICON_MULTIPLY accessory_flags = HAIR_VERY_SHORT uid = "acc_hair_una_horns" -/decl/sprite_accessory/horns/lizard/spines_long +/decl/sprite_accessory/horns/unathi/spines_long name = "Lizard Spines Long" icon_state = "spines_long" uid = "acc_hair_una_longspines" -/decl/sprite_accessory/horns/lizard/spines_short +/decl/sprite_accessory/horns/unathi/spines_short name = "Lizard Spines Short" icon_state = "spines_short" uid = "acc_hair_una_shortspines" -/decl/sprite_accessory/horns/lizard/bighorns +/decl/sprite_accessory/horns/unathi/bighorns name = "Lizard Horns Big" icon_state = "horns_big" uid = "acc_hair_una_bighorns" -/decl/sprite_accessory/horns/lizard/smallhorns +/decl/sprite_accessory/horns/unathi/smallhorns name = "Lizard Horns Small" icon_state = "horns_small" uid = "acc_hair_una_smallhorns" -/decl/sprite_accessory/horns/lizard/shorthorns +/decl/sprite_accessory/horns/unathi/shorthorns name = "Lizard Horns Short" icon_state = "horns_short" uid = "acc_hair_una_shorthorns" -/decl/sprite_accessory/horns/lizard/curledhorns +/decl/sprite_accessory/horns/unathi/curledhorns name = "Lizard Horns Curled" icon_state = "horns_curled" uid = "acc_hair_una_curledhorns" -/decl/sprite_accessory/horns/lizard/ramhorns +/decl/sprite_accessory/horns/unathi/ramhorns name = "Lizard Horns Ram" icon_state = "horns_ram" uid = "acc_hair_una_ramhorns" -/decl/sprite_accessory/horns/lizard/ramhornsthick +/decl/sprite_accessory/horns/unathi/ramhornsthick name = "Lizard Horns Ram Thick" icon_state = "horns_ram_thick" uid = "acc_hair_una_ramhornsthick" -/decl/sprite_accessory/horns/lizard/doublehorns +/decl/sprite_accessory/horns/unathi/doublehorns name = "Lizard Horns Double" icon_state = "horns_double" uid = "acc_hair_una_doublehorns" -/decl/sprite_accessory/horns/lizard/chin +/decl/sprite_accessory/horns/unathi/chin name = "Lizard Horn Chin" icon_state = "facial_chinhorns" uid = "acc_fhair_una_chinhorns" -/decl/sprite_accessory/horns/lizard/hornadorns +/decl/sprite_accessory/horns/unathi/hornadorns name = "Lizard Horn Adorns" icon_state = "facial_hornadorns" uid = "acc_fhair_una_adorns" -/decl/sprite_accessory/horns/lizard/spinespikes +/decl/sprite_accessory/horns/unathi/spinespikes name = "Lizard Spine Spikes" icon_state = "facial_spikes" uid = "acc_fhair_una_spinespikes" -/decl/sprite_accessory/frills/lizard +/decl/sprite_accessory/frills/unathi name = "Lizard Frills Aqua" - icon = 'mods/species/bayliens/unathi/icons/frills.dmi' + icon = 'mods/species/unathi/icons/frills.dmi' icon_state = "frills_aqua" - species_allowed = list(SPECIES_LIZARD) + species_allowed = list(SPECIES_UNATHI) color_blend = ICON_MULTIPLY accessory_flags = HAIR_VERY_SHORT uid = "acc_hair_una_aqua" -/decl/sprite_accessory/frills/lizard/hood +/decl/sprite_accessory/frills/unathi/hood name = "Lizard Cobra Hood" icon_state = "cobrahood" uid = "acc_hair_una_cobra" -/decl/sprite_accessory/frills/lizard/frills_long +/decl/sprite_accessory/frills/unathi/frills_long name = "Lizard Frills Long" icon_state = "frills_long" uid = "acc_hair_una_longfrills" -/decl/sprite_accessory/frills/lizard/frills_short +/decl/sprite_accessory/frills/unathi/frills_short name = "Lizard Frills Short" icon_state = "frills_short" uid = "acc_hair_una_shortfrills" -/decl/sprite_accessory/frills/lizard/sidefrills +/decl/sprite_accessory/frills/unathi/sidefrills name = "Lizard Frills Side" icon_state = "frills_side" uid = "acc_hair_una_sidefrills" -/decl/sprite_accessory/frills/lizard/spinedfrillslong +/decl/sprite_accessory/frills/unathi/spinedfrillslong name = "Lizard Spined Long Frills" icon_state = "spined_long_frills" uid = "acc_hair_una_longspinedfrills" -/decl/sprite_accessory/frills/lizard/spinedfrillsshort +/decl/sprite_accessory/frills/unathi/spinedfrillsshort name = "Lizard Spined Short Frills" icon_state = "spined_short_frills" uid = "acc_hair_una_shortspinedfrills" -/decl/sprite_accessory/frills/lizard/dorsalfrill +/decl/sprite_accessory/frills/unathi/dorsalfrill name = "Lizard Frill Dorsal" icon_state = "facial_dorsalfrill" uid = "acc_fhair_una_dorsalfrill" diff --git a/mods/species/bayliens/unathi/icons/body_female.dmi b/mods/species/unathi/icons/body_female.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/body_female.dmi rename to mods/species/unathi/icons/body_female.dmi diff --git a/mods/species/bayliens/unathi/icons/body_male.dmi b/mods/species/unathi/icons/body_male.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/body_male.dmi rename to mods/species/unathi/icons/body_male.dmi diff --git a/mods/species/bayliens/unathi/icons/cosmetics.dmi b/mods/species/unathi/icons/cosmetics.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/cosmetics.dmi rename to mods/species/unathi/icons/cosmetics.dmi diff --git a/mods/species/bayliens/unathi/icons/deformed_body_female.dmi b/mods/species/unathi/icons/deformed_body_female.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/deformed_body_female.dmi rename to mods/species/unathi/icons/deformed_body_female.dmi diff --git a/mods/species/bayliens/unathi/icons/deformed_body_male.dmi b/mods/species/unathi/icons/deformed_body_male.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/deformed_body_male.dmi rename to mods/species/unathi/icons/deformed_body_male.dmi diff --git a/mods/species/bayliens/unathi/icons/eyes.dmi b/mods/species/unathi/icons/eyes.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/eyes.dmi rename to mods/species/unathi/icons/eyes.dmi diff --git a/mods/species/bayliens/unathi/icons/footprints.dmi b/mods/species/unathi/icons/footprints.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/footprints.dmi rename to mods/species/unathi/icons/footprints.dmi diff --git a/mods/species/bayliens/unathi/icons/frills.dmi b/mods/species/unathi/icons/frills.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/frills.dmi rename to mods/species/unathi/icons/frills.dmi diff --git a/mods/species/bayliens/unathi/icons/horns.dmi b/mods/species/unathi/icons/horns.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/horns.dmi rename to mods/species/unathi/icons/horns.dmi diff --git a/mods/species/bayliens/unathi/icons/husk.dmi b/mods/species/unathi/icons/husk.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/husk.dmi rename to mods/species/unathi/icons/husk.dmi diff --git a/mods/species/bayliens/unathi/icons/organs.dmi b/mods/species/unathi/icons/organs.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/organs.dmi rename to mods/species/unathi/icons/organs.dmi diff --git a/mods/species/bayliens/unathi/icons/tail.dmi b/mods/species/unathi/icons/tail.dmi similarity index 100% rename from mods/species/bayliens/unathi/icons/tail.dmi rename to mods/species/unathi/icons/tail.dmi diff --git a/mods/species/bayliens/unathi/organs/organs_internal.dm b/mods/species/unathi/organs/organs_internal.dm similarity index 56% rename from mods/species/bayliens/unathi/organs/organs_internal.dm rename to mods/species/unathi/organs/organs_internal.dm index 1edd08ffc19f..307a2cbdbc33 100644 --- a/mods/species/bayliens/unathi/organs/organs_internal.dm +++ b/mods/species/unathi/organs/organs_internal.dm @@ -1,7 +1,7 @@ -/obj/item/organ/internal/eyes/lizard +/obj/item/organ/internal/eyes/unathi name = "reptilian eyes" desc = "Eyes belonging to a big lizard. They seem to be staring right at you no matter where you look from." - icon = 'mods/species/bayliens/unathi/icons/organs.dmi' + icon = 'mods/species/unathi/icons/organs.dmi' -/obj/item/organ/internal/brain/lizard +/obj/item/organ/internal/brain/unathi can_use_brain_interface = FALSE diff --git a/mods/species/bayliens/unathi/sound/lizard_breathing.ogg b/mods/species/unathi/sound/lizard_breathing.ogg similarity index 100% rename from mods/species/bayliens/unathi/sound/lizard_breathing.ogg rename to mods/species/unathi/sound/lizard_breathing.ogg From 4b3f8db73f03870b7e4033191c1ffa79d75e2506 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Tue, 28 Jan 2025 16:18:17 +1100 Subject: [PATCH 024/133] Adding item-based intent. --- code/_onclick/hud/screen/screen_intent.dm | 9 +-- code/game/objects/items/__item.dm | 8 +++ code/modules/mob/inventory.dm | 3 +- code/modules/mob/living/inventory.dm | 1 + code/modules/mob/mob_intent.dm | 79 ++++++++++++++++------ mods/mobs/dionaea/mob/_nymph.dm | 12 ---- mods/mobs/dionaea/mob/nymph_ui.dm | 14 ---- mods/species/ascent/mobs/nymph/_nymph.dm | 12 ---- mods/species/ascent/mobs/nymph/nymph_ui.dm | 13 ---- 9 files changed, 74 insertions(+), 77 deletions(-) diff --git a/code/_onclick/hud/screen/screen_intent.dm b/code/_onclick/hud/screen/screen_intent.dm index ca75b836812a..b3cfac440600 100644 --- a/code/_onclick/hud/screen/screen_intent.dm +++ b/code/_onclick/hud/screen/screen_intent.dm @@ -98,20 +98,21 @@ var/decl/intent/owner_intent = owner.get_intent() var/i = 1 - var/list/all_intents = owner.get_available_intents() + var/list/unused_selectors = intent_selectors?.Copy() + var/list/all_intents = owner.get_available_intents(skip_update = TRUE) for(var/decl/intent/intent as anything in all_intents) var/obj/screen/intent_button/intent_button = get_intent_button(i) if(intent == owner_intent) intent_button.set_selected(intent) else intent_button.set_deselected(intent) + LAZYREMOVE(unused_selectors, intent_button) i++ apply_intent_button_offset(intent_button, i, length(all_intents)) add_vis_contents(intent_button) - if(i < length(intent_selectors)) - for(var/index = i+1 to length(intent_selectors)) - remove_vis_contents(intent_selectors[index]) + if(length(unused_selectors)) + remove_vis_contents(unused_selectors) /obj/screen/intent/binary intent_width = 32 diff --git a/code/game/objects/items/__item.dm b/code/game/objects/items/__item.dm index 7c41d0aa13fb..251631f4ce06 100644 --- a/code/game/objects/items/__item.dm +++ b/code/game/objects/items/__item.dm @@ -1153,8 +1153,13 @@ modules/mob/living/human/life.dm if you die, you will be zoomed out. /obj/item/proc/loadout_should_keep(obj/item/new_item, mob/wearer) return type != new_item.type && !replaced_in_loadout +/obj/item/dropped(mob/user, slot) + . = ..() + user?.clear_available_intents() + /obj/item/equipped(mob/user, slot) . = ..() + user?.clear_available_intents() // delay for 1ds to allow the rest of the call stack to resolve if(!QDELETED(src) && !QDELETED(user) && user.get_equipped_slot_for_item(src) == slot) try_burn_wearer(user, slot, 1) @@ -1285,3 +1290,6 @@ modules/mob/living/human/life.dm if you die, you will be zoomed out. squash_item() if(!QDELETED(src)) physically_destroyed() + +/obj/item/proc/get_provided_intents(mob/wielder) + return null diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index f4482ab7e987..a963be6b2e49 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -466,7 +466,8 @@ return /mob/proc/select_held_item_slot(var/slot) - return + SHOULD_CALL_PARENT(TRUE) + clear_available_intents() /mob/proc/get_inventory_slots() return diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm index f0ab7bdc92eb..827d16090d09 100644 --- a/code/modules/mob/living/inventory.dm +++ b/code/modules/mob/living/inventory.dm @@ -58,6 +58,7 @@ queue_hand_rebuild() /mob/living/select_held_item_slot(var/slot) + . = ..() var/last_slot = get_active_held_item_slot() if(slot != last_slot && (slot in get_held_item_slots())) _held_item_slot_selected = slot diff --git a/code/modules/mob/mob_intent.dm b/code/modules/mob/mob_intent.dm index b55b2342ed84..1e28bd7df8dd 100644 --- a/code/modules/mob/mob_intent.dm +++ b/code/modules/mob/mob_intent.dm @@ -35,6 +35,10 @@ var/icon = 'icons/screen/intents.dmi' /// State used to update intent selector. var/icon_state + /// Whether or not this intent is available if you have an item in your hand. + var/requires_empty_hand + /// Intents to be removed from the available list if this intent is present. + var/list/blocks_other_intents /decl/intent/validate() . = ..() @@ -83,20 +87,10 @@ icon_state = "intent_disarm" sort_order = 2 // Corresponding to hotkey order. -// Used by nymphs. -/decl/intent/harm/binary - icon = 'icons/screen/intents_wide.dmi' - uid = "intent_harm_simple" - intent_flags = (I_FLAG_HARM|I_FLAG_DISARM) - -/decl/intent/help/binary - icon = 'icons/screen/intents_wide.dmi' - uid = "intent_help_simple" - intent_flags = (I_FLAG_HARM|I_FLAG_GRAB) - /mob /// Decl for current 'intent' of mob; hurt, harm, etc. Initialized by get_intent(). - var/decl/intent/_a_intent + VAR_PRIVATE/decl/intent/_a_intent + VAR_PRIVATE/list/_available_intents /mob/proc/check_intent(checking_intent) var/decl/intent/intent = get_intent() // Ensures intent has been initalised. @@ -112,7 +106,7 @@ if(!isnum(new_intent)) new_intent = resolve_intent(new_intent) else // Retrieve intent decl based on flag. - for(var/decl/intent/intent as anything in get_available_intents()) + for(var/decl/intent/intent as anything in get_available_intents(skip_update = TRUE)) if(intent.intent_flags & new_intent) new_intent = intent break @@ -127,6 +121,15 @@ /mob/proc/get_intent() RETURN_TYPE(/decl/intent) + var/list/available_intents = get_available_intents() + if(length(available_intents) && (!_a_intent || !(_a_intent in available_intents))) + var/new_intent + if(_a_intent) + for(var/decl/intent/intent in available_intents) + if(_a_intent.intent_flags & intent.intent_flags) + new_intent = intent + break + _a_intent = new_intent || available_intents[1] if(!_a_intent) _a_intent = get_default_intent() return _a_intent @@ -134,25 +137,59 @@ /mob/proc/get_default_intent() return GET_DECL(/decl/intent/help) -/mob/proc/get_available_intents() - var/static/list/available_intents - if(!available_intents) - available_intents = list( +/mob/proc/get_default_intents() + var/static/list/default_intents + if(!default_intents) + default_intents = list( GET_DECL(/decl/intent/help), GET_DECL(/decl/intent/disarm), GET_DECL(/decl/intent/grab), GET_DECL(/decl/intent/harm) ) - available_intents = sortTim(available_intents, /proc/cmp_decl_sort_value_asc) - return available_intents + return default_intents + +/mob/proc/clear_available_intents(skip_update, skip_sleep) + set waitfor = FALSE + if(!skip_sleep) + sleep(0) + if(QDELETED(src)) + return + _available_intents = null + if(!skip_update && istype(hud_used) && hud_used.action_intent) + hud_used.action_intent.update_icon() + +/mob/proc/get_available_intents(skip_update, force) + var/obj/item/held = get_active_held_item() + if(!held) + _available_intents = get_default_intents() + else if(force || !_available_intents) + // Grab all relevant intents. + _available_intents = list() + for(var/decl/intent/intent as anything in get_default_intents()) + if(intent.requires_empty_hand) + continue + _available_intents += intent + // Add inhand intents. + var/list/held_intents = held.get_provided_intents(src) + if(length(held_intents)) + _available_intents |= held_intents + // Trim blocked intents. + for(var/decl/intent/intent as anything in _available_intents) + _available_intents -= intent.blocks_other_intents + // Sort by hotkey order. + _available_intents = sortTim(_available_intents, /proc/cmp_decl_sort_value_asc) + // Update our HUD immediately. + if(!skip_update && istype(hud_used) && hud_used.action_intent) + hud_used.action_intent.update_icon() + return _available_intents /mob/proc/cycle_intent(input) set name = "a-intent" set hidden = TRUE switch(input) if(INTENT_HOTKEY_RIGHT) - return set_intent(next_in_list(get_intent(), get_available_intents())) + return set_intent(next_in_list(get_intent(), get_available_intents(skip_update = TRUE))) if(INTENT_HOTKEY_LEFT) - return set_intent(previous_in_list(get_intent(), get_available_intents())) + return set_intent(previous_in_list(get_intent(), get_available_intents(skip_update = TRUE))) else // Fallback, should just use set_intent() directly return set_intent(input) diff --git a/mods/mobs/dionaea/mob/_nymph.dm b/mods/mobs/dionaea/mob/_nymph.dm index a1c8efe44862..9e6f68f30bac 100644 --- a/mods/mobs/dionaea/mob/_nymph.dm +++ b/mods/mobs/dionaea/mob/_nymph.dm @@ -76,18 +76,6 @@ heal_damage(OXY, rads, do_update_health = FALSE) heal_damage(TOX, rads) -/* -/mob/living/simple_animal/alien/diona/get_default_intent() - return GET_DECL(/decl/intent/help/binary/diona) - -/mob/living/simple_animal/alien/diona/get_available_intents() - var/static/list/available_intents = list( - GET_DECL(/decl/intent/harm/binary/diona), - GET_DECL(/decl/intent/help/binary/diona) - ) - return available_intents -*/ - /decl/bodytype/diona name = "nymph" bodytype_flag = 0 diff --git a/mods/mobs/dionaea/mob/nymph_ui.dm b/mods/mobs/dionaea/mob/nymph_ui.dm index fc44f7639a3b..dca19d4b764b 100644 --- a/mods/mobs/dionaea/mob/nymph_ui.dm +++ b/mods/mobs/dionaea/mob/nymph_ui.dm @@ -1,17 +1,3 @@ -/* Commented out due to issues with interactions and combined intent flags. -/obj/screen/intent/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intents.dmi' - screen_loc = DIONA_SCREEN_LOC_INTENT - -/decl/intent/harm/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intent_overlay.dmi' - uid = "intent_harm_binary_diona" - -/decl/intent/help/binary/diona - icon = 'mods/mobs/dionaea/icons/ui_intent_overlay.dmi' - uid = "intent_help_binary_diona" -*/ - /decl/ui_style/diona name = "Diona" restricted = TRUE diff --git a/mods/species/ascent/mobs/nymph/_nymph.dm b/mods/species/ascent/mobs/nymph/_nymph.dm index 16447b0c51dc..da48aabf82e1 100644 --- a/mods/species/ascent/mobs/nymph/_nymph.dm +++ b/mods/species/ascent/mobs/nymph/_nymph.dm @@ -51,15 +51,3 @@ /mob/living/simple_animal/alien/kharmaan/get_dexterity(var/silent) return (DEXTERITY_EQUIP_ITEM) - -/* -/mob/living/simple_animal/alien/kharmaan/get_default_intent() - return GET_DECL(/decl/intent/help/binary/ascent) - -/mob/living/simple_animal/alien/kharmaan/get_available_intents() - var/static/list/available_intents = list( - GET_DECL(/decl/intent/harm/binary/ascent), - GET_DECL(/decl/intent/help/binary/ascent) - ) - return available_intents -*/ \ No newline at end of file diff --git a/mods/species/ascent/mobs/nymph/nymph_ui.dm b/mods/species/ascent/mobs/nymph/nymph_ui.dm index e3b6d1ec70c8..85fc14b3affb 100644 --- a/mods/species/ascent/mobs/nymph/nymph_ui.dm +++ b/mods/species/ascent/mobs/nymph/nymph_ui.dm @@ -1,16 +1,3 @@ -/* Commented out due to issues with interactions and combined intent flags. -/obj/screen/intent/binary/ascent - icon = 'mods/species/ascent/icons/ui_intents.dmi' - screen_loc = ANYMPH_SCREEN_LOC_INTENT - -/decl/intent/harm/binary/ascent - icon = 'mods/species/ascent/icons/ui_intent_overlay.dmi' - uid = "intent_harm_binary_ascent" - -/decl/intent/help/binary/ascent - icon = 'mods/species/ascent/icons/ui_intent_overlay.dmi' - uid = "intent_help_binary_ascent" -*/ /obj/screen/ascent_nymph_molt name = "molt" icon = 'mods/species/ascent/icons/ui_molt.dmi' From 2344d7154b970f09c2f0edd9bb0ed2146aa620c2 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Tue, 21 Jan 2025 20:33:03 -0500 Subject: [PATCH 025/133] Fix lighting on maps loaded after SSlighting init --- code/controllers/subsystems/lighting.dm | 5 ++++- code/game/turfs/turf.dm | 4 ++++ code/game/turfs/unsimulated.dm | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm index 61f8b083a33b..068353abbe0c 100644 --- a/code/controllers/subsystems/lighting.dm +++ b/code/controllers/subsystems/lighting.dm @@ -57,7 +57,10 @@ SUBSYSTEM_DEF(lighting) var/datum/level_data/level = SSmapping.levels_by_z[zlevel] for (var/turf/tile as anything in block(1, 1, zlevel, level.level_max_width, level.level_max_height)) // include TRANSITIONEDGE turfs if (TURF_IS_DYNAMICALLY_LIT_UNSAFE(tile)) - tile.lighting_build_overlay() + if(!isnull(tile.lighting_overlay)) + log_warning("Attempted to create lighting_overlay on [tile.get_log_info_line()] when it already had one.") + continue + new /atom/movable/lighting_overlay(tile) overlaycount++ CHECK_TICK diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 43f51cce2185..3835a0d491d1 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -118,6 +118,10 @@ else if (permit_ao) queue_ao() + // we're being loaded in a new z-level, we need to build lighting + if(mapload && !changing_turf && SSlighting.initialized) + lighting_build_overlay() + if(simulated) updateVisibility(src, FALSE) diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm index 67200a23bf89..11b5cc486d6a 100644 --- a/code/game/turfs/unsimulated.dm +++ b/code/game/turfs/unsimulated.dm @@ -3,6 +3,7 @@ initial_gas = GAS_STANDARD_AIRMIX abstract_type = /turf/unsimulated simulated = FALSE + dynamic_lighting = FALSE // Shortcut a bunch of simulation stuff since this turf just needs to sit there. // We don't even call Initialize(), how cool is that??? From 097a2d70083c7b41fe1dcaabb570aaabf1c6bfb7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:43:34 -0500 Subject: [PATCH 026/133] Improve descriptions for atmos machinery --- code/game/machinery/atmoalter/meter.dm | 2 +- code/game/machinery/igniter.dm | 2 +- .../atmospherics/components/binary_devices/pump.dm | 2 +- .../components/binary_devices/volume_pump.dm | 2 +- .../atmospherics/components/omni_devices/filter.dm | 1 + .../atmospherics/components/omni_devices/mixer.dm | 1 + .../atmospherics/components/portables_connector.dm | 4 ++-- code/modules/atmospherics/components/tvalve.dm | 4 ++-- .../atmospherics/components/unary/thermal_plate.dm | 6 ++++-- .../atmospherics/components/unary/vent_pump.dm | 5 +++-- code/modules/atmospherics/components/valve.dm | 4 ++-- code/modules/atmospherics/pipes.dm | 14 +++++++------- 12 files changed, 26 insertions(+), 21 deletions(-) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 4dd3caeb6fd1..3b0ef569f603 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -1,6 +1,6 @@ /obj/machinery/meter name = "meter" - desc = "A gas flow meter." + desc = "A meter that monitors gas composition, pressure, and temperature in the attached pipe." icon = 'icons/obj/meter.dmi' icon_state = "meterX" var/atom/target = null //A pipe for the base type diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 47f7eab52117..26a071ea6aef 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -1,6 +1,6 @@ /obj/machinery/igniter name = "igniter" - desc = "It's useful for igniting flammable items." + desc = "A device that ignites flammable items and gases nearby when activated." icon = 'icons/obj/machines/igniter.dmi' icon_state = "igniter1" var/on = 0 diff --git a/code/modules/atmospherics/components/binary_devices/pump.dm b/code/modules/atmospherics/components/binary_devices/pump.dm index 156e19f2f39a..858f44da07a9 100644 --- a/code/modules/atmospherics/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/components/binary_devices/pump.dm @@ -18,7 +18,7 @@ Thus, the two variables affect pump operation are set in New(): level = LEVEL_BELOW_PLATING name = "gas pump" - desc = "A pump." + desc = "A pump that can pressurize gas and restrict flow to one direction." var/target_pressure = ONE_ATMOSPHERE diff --git a/code/modules/atmospherics/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/components/binary_devices/volume_pump.dm index 88dfdd3675e1..f39465004901 100644 --- a/code/modules/atmospherics/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/components/binary_devices/volume_pump.dm @@ -4,7 +4,7 @@ level = LEVEL_BELOW_PLATING name = "high power gas pump" - desc = "A pump. Has double the power rating of the standard gas pump." + desc = "A pump that can pressurize gas and restrict flow to one direction. Has double the power rating of the standard gas pump." idle_power_usage = 450 // oversized pumps means oversized idle use power_rating = 45000 // 45000 W ~ 60 HP diff --git a/code/modules/atmospherics/components/omni_devices/filter.dm b/code/modules/atmospherics/components/omni_devices/filter.dm index 434e0f8f5bd6..ae66c0bddcf3 100644 --- a/code/modules/atmospherics/components/omni_devices/filter.dm +++ b/code/modules/atmospherics/components/omni_devices/filter.dm @@ -3,6 +3,7 @@ //-------------------------------------------- /obj/machinery/atmospherics/omni/filter name = "omni gas filter" + desc = "A device that can separate components of a gas mixture and redirect them to different pipes." icon_state = "map_filter" core_icon = "filter" diff --git a/code/modules/atmospherics/components/omni_devices/mixer.dm b/code/modules/atmospherics/components/omni_devices/mixer.dm index 51cc1b4be454..a7bca1ad61d6 100644 --- a/code/modules/atmospherics/components/omni_devices/mixer.dm +++ b/code/modules/atmospherics/components/omni_devices/mixer.dm @@ -3,6 +3,7 @@ //-------------------------------------------- /obj/machinery/atmospherics/omni/mixer name = "omni gas mixer" + desc = "A device that combines two or more gases to produce a mix with a specific ratio." icon_state = "map_mixer" core_icon = "mixer" diff --git a/code/modules/atmospherics/components/portables_connector.dm b/code/modules/atmospherics/components/portables_connector.dm index d02606404037..d6898b129870 100644 --- a/code/modules/atmospherics/components/portables_connector.dm +++ b/code/modules/atmospherics/components/portables_connector.dm @@ -3,7 +3,7 @@ icon_state = "map_connector" name = "connector port" - desc = "For connecting portable devices related to atmospherics control." + desc = "A connector port with a flexible tube that can be attached to portable atmospherics devices using a wrench." dir = SOUTH initialize_directions = SOUTH @@ -69,7 +69,7 @@ /obj/machinery/atmospherics/portables_connector/cannot_transition_to(state_path, mob/user) if(state_path == /decl/machine_construction/default/deconstructed) if (connected_device) - return SPAN_WARNING("You cannot unwrench \the [src], dettach \the [connected_device] first.") + return SPAN_WARNING("You cannot unwrench \the [src], detach \the [connected_device] first.") if (locate(/obj/machinery/portable_atmospherics, src.loc)) return MCS_BLOCK return ..() \ No newline at end of file diff --git a/code/modules/atmospherics/components/tvalve.dm b/code/modules/atmospherics/components/tvalve.dm index 326dfddbe776..cb27953dca66 100644 --- a/code/modules/atmospherics/components/tvalve.dm +++ b/code/modules/atmospherics/components/tvalve.dm @@ -4,7 +4,7 @@ var/base_icon_state = "tvalve" name = "manual switching valve" - desc = "A pipe valve." + desc = "A pipe valve that switches gas flow between two branches, and must be operated by hand." level = LEVEL_BELOW_PLATING dir = SOUTH @@ -176,7 +176,7 @@ /obj/machinery/atmospherics/tvalve/digital // can be controlled by AI name = "digital switching valve" - desc = "A digitally controlled valve." + desc = "A digitally-controlled pipe valve that switches gas flow between two branches." icon = 'icons/atmos/digital_tvalve.dmi' icon_state = "map_tvalve0" diff --git a/code/modules/atmospherics/components/unary/thermal_plate.dm b/code/modules/atmospherics/components/unary/thermal_plate.dm index 9f07a26b3b43..6619e07e85d6 100644 --- a/code/modules/atmospherics/components/unary/thermal_plate.dm +++ b/code/modules/atmospherics/components/unary/thermal_plate.dm @@ -1,6 +1,8 @@ #define RADIATION_CAPACITY 30000 //Radiation isn't particularly effective (TODO BALANCE) +// LMAO? This should probably be removed. +// Check Q2 2025 if this is gone yet or not. /obj/machinery/atmospherics/unary/thermal_plate //Based off Heat Reservoir and Space Heater //Transfers heat between a pipe system and environment, based on which has a greater thermal energy concentration @@ -8,8 +10,8 @@ icon = 'icons/obj/atmospherics/cold_sink.dmi' icon_state = "intact_off" - name = "Thermal Transfer Plate" - desc = "Transfers heat to and from an area" + name = "thermal transfer plate" + desc = "A device that transfers heat to and from an area." uncreated_component_parts = null frame_type = /obj/item/pipe construct_state = /decl/machine_construction/pipe diff --git a/code/modules/atmospherics/components/unary/vent_pump.dm b/code/modules/atmospherics/components/unary/vent_pump.dm index 1ddb358e0eca..ab70259be368 100644 --- a/code/modules/atmospherics/components/unary/vent_pump.dm +++ b/code/modules/atmospherics/components/unary/vent_pump.dm @@ -11,8 +11,8 @@ icon = 'icons/atmos/vent_pump.dmi' icon_state = "map_vent" - name = "Air Vent" - desc = "Has a valve and pump attached to it." + name = "air vent" + desc = "A vent that moves air into or out of the attached pipe system, and uses a valve and pump to prevent backflow." use_power = POWER_USE_OFF idle_power_usage = 150 //internal circuitry, friction losses and stuff power_rating = 30000 // 30000 W ~ 40 HP @@ -160,6 +160,7 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume name = "large air vent" + desc = "A high-volume vent that moves lots of air into or out of the attached pipe system, and uses a valve and pump to prevent backflow." power_channel = EQUIP power_rating = 45000 base_type = /obj/machinery/atmospherics/unary/vent_pump/high_volume/buildable diff --git a/code/modules/atmospherics/components/valve.dm b/code/modules/atmospherics/components/valve.dm index ccf203513a29..a34f64ae0010 100644 --- a/code/modules/atmospherics/components/valve.dm +++ b/code/modules/atmospherics/components/valve.dm @@ -3,7 +3,7 @@ icon_state = "map_valve0" name = "manual valve" - desc = "A pipe valve." + desc = "A valve that controls flow through a pipe network, and must be operated by hand." level = LEVEL_BELOW_PLATING dir = SOUTH @@ -150,7 +150,7 @@ /obj/machinery/atmospherics/valve/digital // can be controlled by AI name = "digital valve" - desc = "A digitally controlled valve." + desc = "A digitally-controlled valve that controls flow through a pipe network." icon = 'icons/atmos/digital_valve.dmi' uncreated_component_parts = list( /obj/item/stock_parts/radio/receiver/buildable, diff --git a/code/modules/atmospherics/pipes.dm b/code/modules/atmospherics/pipes.dm index 832e0186318a..2840d64ba682 100644 --- a/code/modules/atmospherics/pipes.dm +++ b/code/modules/atmospherics/pipes.dm @@ -416,7 +416,7 @@ level = LEVEL_ABOVE_PLATING /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers - name="Scrubbers pipe manifold" + name = "scrubbers pipe manifold" desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER @@ -424,7 +424,7 @@ color = PIPE_COLOR_RED /obj/machinery/atmospherics/pipe/manifold/visible/supply - name="Air supply pipe manifold" + name = "air supply pipe manifold" desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = CONNECT_TYPE_SUPPLY @@ -463,7 +463,7 @@ alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers - name="Scrubbers pipe manifold" + name = "scrubbers pipe manifold" desc = "A manifold composed of scrubbers pipes." icon_state = "map-scrubbers" connect_types = CONNECT_TYPE_SCRUBBER @@ -471,7 +471,7 @@ color = PIPE_COLOR_RED /obj/machinery/atmospherics/pipe/manifold/hidden/supply - name="Air supply pipe manifold" + name = "air supply pipe manifold" desc = "A manifold composed of supply pipes." icon_state = "map-supply" connect_types = CONNECT_TYPE_SUPPLY @@ -699,7 +699,7 @@ connect_types = CONNECT_TYPE_FUEL /obj/machinery/atmospherics/pipe/simple/visible/universal - name="Universal pipe adapter" + name = "universal pipe adapter" desc = "An adapter for regular, supply, scrubbers, and fuel pipes." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE icon_state = "map_universal" @@ -717,8 +717,8 @@ universal_underlays(direction) /obj/machinery/atmospherics/pipe/simple/hidden/universal - name="Universal pipe adapter" - desc = "An adapter for regular, supply and scrubbers pipes." + name = "universal pipe adapter" + desc = "An adapter for regular, supply, scrubbers, and fuel pipes." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE icon_state = "map_universal" build_icon_state = "universal" From db803fb11902bdcd900ac67d74631255c3d46b3a Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:43:40 -0500 Subject: [PATCH 027/133] Improve descriptions for disposals machinery --- code/modules/recycling/disposalpipe.dm | 7 ++++++- code/modules/recycling/sortingmachinery.dm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/disposalpipe.dm b/code/modules/recycling/disposalpipe.dm index 88e11fbbdc60..6727ee5fbfa8 100644 --- a/code/modules/recycling/disposalpipe.dm +++ b/code/modules/recycling/disposalpipe.dm @@ -236,6 +236,7 @@ // a straight or bent segment /obj/structure/disposalpipe/segment + desc = "A linear segment of disposal piping that simply moves things from one end to the other." icon_state = "pipe-s" // Sadly this var stores state. "pipe-c" is corner. Should be changed, but requires huge map diff. turn = DISPOSAL_FLIP_FLIP @@ -364,6 +365,7 @@ //a three-way junction with dir being the dominant direction /obj/structure/disposalpipe/junction + desc = "A three-way segment of disposal piping that merges two incoming directions into a third outgoing one." icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP flipped_state = /obj/structure/disposalpipe/junction/mirrored @@ -413,6 +415,7 @@ /obj/structure/disposalpipe/tagger name = "package tagger" + desc = "A pipe that tags things passing through it with a sorting tag." icon_state = "pipe-tagger" var/sort_tag = "" var/partial = 0 @@ -459,6 +462,7 @@ /obj/structure/disposalpipe/tagger/partial //needs two passes to tag name = "partial package tagger" + desc = "A pipe that tags things passing through it with a sorting tag... but only the second time around." icon_state = "pipe-tagger-partial" partial = 1 turn = DISPOSAL_FLIP_FLIP @@ -480,7 +484,7 @@ /obj/structure/disposalpipe/diversion_junction/proc/updatedesc() desc = initial(desc) if(sort_type) - desc += "\nIt's currently [active ? "" : "un"]active!" + desc += "\nIt's currently [active ? "" : "in"]active!" /obj/structure/disposalpipe/diversion_junction/proc/updatedir() inactive_dir = dir @@ -687,6 +691,7 @@ //a trunk joining to a disposal bin or outlet on the same turf /obj/structure/disposalpipe/trunk + desc = "A section of pneumatic piping made to connect to a bin or outlet." icon_state = "pipe-t" var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 76e6c440ec3a..274c5aec2599 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,6 +1,6 @@ /obj/machinery/disposal/deliveryChute name = "delivery chute" - desc = "A chute for big and small packages alike!" + desc = "A chute to put things into a disposal network. Takes big and small packages alike!" density = TRUE icon = 'icons/obj/pipes/disposal_chute.dmi' icon_state = "chute" From 76e40ebca0855ffed5e59ccdc9ebd772a2bcd5f7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 15:45:15 -0500 Subject: [PATCH 028/133] Improve descriptions for pipe/atmospherics fabricator recipes --- .../designs/pipe/device_pipe_datums.dm | 25 -------- .../designs/pipe/disposal_pipe_datums.dm | 20 ------- .../designs/pipe/pipe_datum_base.dm | 6 ++ .../fabrication/designs/pipe/pipe_datums.dm | 58 +++++++++---------- 4 files changed, 35 insertions(+), 74 deletions(-) diff --git a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm index 829699096898..87d1753cbe2f 100644 --- a/code/modules/fabrication/designs/pipe/device_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/device_pipe_datums.dm @@ -4,7 +4,6 @@ pipe_color = PIPE_COLOR_WHITE name = "connector" - desc = "a connector for canisters." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "connector" constructed_path = /obj/machinery/atmospherics/portables_connector @@ -13,7 +12,6 @@ /datum/fabricator_recipe/pipe/device/adapter name = "universal pipe adapter" - desc = "an adapter designed to fit any type of pipe." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_SCRUBBER|CONNECT_TYPE_FUEL|CONNECT_TYPE_HE build_icon_state = "universal" constructed_path = /obj/machinery/atmospherics/pipe/simple/hidden/universal @@ -22,7 +20,6 @@ /datum/fabricator_recipe/pipe/device/unaryvent name = "unary vent" - desc = "a unary vent" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SUPPLY|CONNECT_TYPE_FUEL build_icon_state = "uvent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump @@ -30,12 +27,10 @@ /datum/fabricator_recipe/pipe/device/unaryvent/large name = "high volume unary vent" - desc = "a high volume unary vent" constructed_path = /obj/machinery/atmospherics/unary/vent_pump/high_volume /datum/fabricator_recipe/pipe/device/gaspump name = "gas pump" - desc = "a pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "pump" constructed_path = /obj/machinery/atmospherics/binary/pump @@ -43,7 +38,6 @@ /datum/fabricator_recipe/pipe/device/pressureregulator name = "pressure regulator" - desc = "a device that regulates pressure." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "passivegate" constructed_path = /obj/machinery/atmospherics/binary/passive_gate @@ -51,7 +45,6 @@ /datum/fabricator_recipe/pipe/device/hpgaspump name = "high powered gas pump" - desc = "a high powered pump. For gasses." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "volumepump" constructed_path = /obj/machinery/atmospherics/binary/pump/high_power @@ -59,7 +52,6 @@ /datum/fabricator_recipe/pipe/device/scrubber name = "scrubber" - desc = "scrubs out undesirable gasses" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_SCRUBBER build_icon_state = "scrubber" constructed_path = /obj/machinery/atmospherics/unary/vent_scrubber @@ -67,7 +59,6 @@ /datum/fabricator_recipe/pipe/device/meter name = "meter" - desc = "a meter that monitors pressure and temperature on the attached pipe." path = /obj/item/machine_chassis/pipe_meter pipe_color = null connect_types = null @@ -78,7 +69,6 @@ /datum/fabricator_recipe/pipe/device/omnimixer name = "omni gas mixer" - desc = "a device that takes in two or three gasses and mixes them into a precise output." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_mixer" constructed_path = /obj/machinery/atmospherics/omni/mixer @@ -86,7 +76,6 @@ /datum/fabricator_recipe/pipe/device/omnifilter name = "omni gas filter" - desc = "a device that filters out undesireable elements" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "omni_filter" constructed_path = /obj/machinery/atmospherics/omni/filter @@ -94,7 +83,6 @@ /datum/fabricator_recipe/pipe/device/manualvalve name = "manual valve" - desc = "a valve that has to be manipulated by hand" build_icon_state = "mvalve" constructed_path = /obj/machinery/atmospherics/valve pipe_class = PIPE_CLASS_BINARY @@ -103,7 +91,6 @@ /datum/fabricator_recipe/pipe/device/digitalvalve name = "digital valve" - desc = "a valve controlled electronically" build_icon_state = "dvalve" constructed_path = /obj/machinery/atmospherics/valve/digital pipe_class = PIPE_CLASS_BINARY @@ -112,7 +99,6 @@ /datum/fabricator_recipe/pipe/device/autoshutoff name = "automatic shutoff valve" - desc = "a valve that can automatically shut itself off" build_icon_state = "svalve" constructed_path = /obj/machinery/atmospherics/valve/shutoff pipe_class = PIPE_CLASS_BINARY @@ -121,7 +107,6 @@ /datum/fabricator_recipe/pipe/device/mtvalve name = "manual t-valve" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalve" constructed_path = /obj/machinery/atmospherics/tvalve pipe_class = PIPE_CLASS_TRINARY @@ -129,7 +114,6 @@ /datum/fabricator_recipe/pipe/device/mtvalvem name = "manual t-valve (mirrored)" - desc = "a three-way valve. T-shaped." build_icon_state = "mtvalvem" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored pipe_class = PIPE_CLASS_TRINARY @@ -137,7 +121,6 @@ /datum/fabricator_recipe/pipe/device/dtvalve name = "digital t-valve" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalve0" constructed_path = /obj/machinery/atmospherics/tvalve/digital @@ -146,7 +129,6 @@ /datum/fabricator_recipe/pipe/device/dtvalvem name = "digital t-valve (mirrored)" - desc = "a three-way valve. T-shaped. This one can be controlled electronically." build_icon = 'icons/atmos/digital_tvalve.dmi' build_icon_state = "map_tvalvem0" constructed_path = /obj/machinery/atmospherics/tvalve/mirrored/digital @@ -155,7 +137,6 @@ /datum/fabricator_recipe/pipe/device/air_sensor name = "gas sensor" - desc = "a sensor. It detects gasses." path = /obj/item/machine_chassis/air_sensor build_icon_state = "gsensor1" build_icon = 'icons/obj/machines/gas_sensor.dmi' @@ -167,7 +148,6 @@ /datum/fabricator_recipe/pipe/device/outlet_injector name = "injector outlet" - desc = "Passively injects gas into its surroundings. Has a valve attached to it that can control flow rate." build_icon = 'icons/atmos/injector.dmi' build_icon_state = "map_injector" connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL @@ -178,7 +158,6 @@ /datum/fabricator_recipe/pipe/device/drain name = "gutter" - desc = "You probably can't get sucked down the plughole." build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain" path = /obj/item/drain @@ -190,7 +169,6 @@ /datum/fabricator_recipe/pipe/device/drain/bath name = "sealable gutter" - desc = "You probably can't get sucked down the plughole. Specially not when it's closed!" build_icon = 'icons/obj/drain.dmi' build_icon_state = "drain_bath" path = /obj/item/drain/bath @@ -202,7 +180,6 @@ /datum/fabricator_recipe/pipe/device/tank name = "pressure tank" - desc = "A large vessel containing pressurized gas." build_icon = 'icons/atmos/tank.dmi' build_icon_state = "air" path = /obj/item/pipe/tank @@ -213,7 +190,6 @@ /datum/fabricator_recipe/pipe/device/plate name = "thermal plate" - desc = "A device which transfers heat to and from an area." build_icon = 'icons/obj/atmospherics/cold_sink.dmi' build_icon_state = "exposed" path = /obj/item/pipe @@ -223,7 +199,6 @@ /datum/fabricator_recipe/pipe/device/igniter name = "igniter" - desc = "A device which will ignite surrounding gasses." build_icon = 'icons/obj/machines/igniter.dmi' build_icon_state = "igniter1" path = /obj/item/machine_chassis/igniter diff --git a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm index 0340a6c60f43..57c4aa6220fb 100644 --- a/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/disposal_pipe_datums.dm @@ -7,7 +7,6 @@ var/turn = DISPOSAL_FLIP_FLIP name = "disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon = 'icons/obj/pipes/disposal_pipe.dmi' build_icon_state = "pipe-s" path = /obj/structure/disposalconstruct @@ -17,56 +16,48 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/bent name = "bent disposal pipe segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-c" turn = DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/segment/bent /datum/fabricator_recipe/pipe/disposal_dispenser/junction name = "disposal pipe junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/junctionm name = "disposal pipe junction (mirrored)" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j2" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/junction/mirrored /datum/fabricator_recipe/pipe/disposal_dispenser/yjunction name = "disposal pipe y-junction" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-y" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/junction /datum/fabricator_recipe/pipe/disposal_dispenser/trunk name = "disposal pipe trunk" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-t" constructed_path = /obj/structure/disposalpipe/trunk turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/up name = "disposal pipe upwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-u" constructed_path = /obj/structure/disposalpipe/up turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/down name = "disposal pipe downwards segment" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-d" constructed_path = /obj/structure/disposalpipe/down turn = DISPOSAL_FLIP_NONE /datum/fabricator_recipe/pipe/disposal_dispenser/device name = "disposal bin" - desc = "A bin used to dispose of trash." build_icon = 'icons/obj/pipes/disposal_bin.dmi' build_icon_state = "disposal" path = /obj/structure/disposalconstruct/machine @@ -75,7 +66,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/outlet name = "disposal outlet" - desc = "an outlet that ejects things from a disposal network." build_icon = 'icons/obj/pipes/disposal_outlet.dmi' build_icon_state = "outlet" path = /obj/structure/disposalconstruct/machine/outlet @@ -83,7 +73,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/chute name = "disposal chute" - desc = "A chute to put things into a disposal network." build_icon = 'icons/obj/pipes/disposal_chute.dmi' build_icon_state = "chute" constructed_path = /obj/machinery/disposal/deliveryChute @@ -91,7 +80,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting name = "disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction @@ -99,7 +87,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcard name = "wildcard disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard @@ -107,7 +94,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untagged name = "untagged disposal sorter" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_RIGHT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged @@ -115,7 +101,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sortingm name = "disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/flipped @@ -123,7 +108,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/wildcardm name = "wildcard disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/wildcard/flipped @@ -131,7 +115,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/sorting/untaggedm name = "untagged disposal sorter (mirrored)" - desc = "Sorts things in a disposal system" build_icon_state = "pipe-j2s" turn = DISPOSAL_FLIP_LEFT|DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/sortjunction/untagged/flipped @@ -139,7 +122,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger name = "disposal tagger" - desc = "It tags things." build_icon_state = "pipe-tagger" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger @@ -147,7 +129,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/tagger/partial name = "disposal partial tagger" - desc = "It tags things." build_icon_state = "pipe-tagger-partial" turn = DISPOSAL_FLIP_FLIP constructed_path = /obj/structure/disposalpipe/tagger/partial @@ -155,7 +136,6 @@ /datum/fabricator_recipe/pipe/disposal_dispenser/device/diversion name = "disposal diverter" - desc = "A huge pipe segment used for constructing disposal systems." build_icon_state = "pipe-j1s" turn = DISPOSAL_FLIP_FLIP | DISPOSAL_FLIP_RIGHT constructed_path = /obj/structure/disposalpipe/diversion_junction diff --git a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm index 8d3c48485e8c..75c5b9e1773b 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datum_base.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datum_base.dm @@ -18,6 +18,12 @@ ) max_amount = 10 +/datum/fabricator_recipe/pipe/New() + . = ..() + if(isnull(desc) && ispath(constructed_path)) + var/obj/constructed_obj = constructed_path + desc = initial(constructed_obj.desc) + /datum/fabricator_recipe/pipe/get_resources() resources = list() var/list/building_cost = atom_info_repository.get_matter_for(constructed_path) diff --git a/code/modules/fabrication/designs/pipe/pipe_datums.dm b/code/modules/fabrication/designs/pipe/pipe_datums.dm index 58ca5c3bde85..b9aea3517c40 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datums.dm @@ -2,19 +2,19 @@ #define PIPE_BENT 5 /datum/fabricator_recipe/pipe - name = "a pipe fitting" - desc = "a straight pipe segment." + name = "pipe fitting" + desc = "A straight pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/bent name = "bent pipe fitting" - desc = "a bent pipe segment" + desc = "A bent pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/manifold name = "pipe manifold fitting" - desc = "a pipe manifold segment" + desc = "A pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden pipe_class = PIPE_CLASS_TRINARY @@ -22,7 +22,7 @@ /datum/fabricator_recipe/pipe/manifold4w name = "four-way pipe manifold fitting" - desc = "a four-way pipe manifold segment" + desc = "A four-way pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden pipe_class = PIPE_CLASS_QUATERNARY @@ -30,7 +30,7 @@ /datum/fabricator_recipe/pipe/cap name = "pipe cap fitting" - desc = "a pipe cap for a regular pipe." + desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden pipe_class = PIPE_CLASS_UNARY @@ -46,7 +46,7 @@ /datum/fabricator_recipe/pipe/down name = "downward pipe fitting" - desc = "a downward pipe." + desc = "A downward pipe." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down rotate_class = PIPE_ROTATE_STANDARD @@ -61,18 +61,18 @@ pipe_class = PIPE_CLASS_BINARY name = "supply pipe fitting" - desc = "a straight supply pipe segment." + desc = "A straight supply pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/bent name = "bent supply pipe fitting" - desc = "a bent supply pipe segment" + desc = "A bent supply pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/manifold name = "supply pipe manifold fitting" - desc = "a supply pipe manifold segment" + desc = "A supply pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/supply pipe_class = PIPE_CLASS_TRINARY @@ -80,7 +80,7 @@ /datum/fabricator_recipe/pipe/supply/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way supply pipe manifold segment" + desc = "A four-way supply pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply pipe_class = PIPE_CLASS_QUATERNARY @@ -88,7 +88,7 @@ /datum/fabricator_recipe/pipe/supply/cap name = "supply pipe cap fitting" - desc = "a pipe cap for a regular pipe." + desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/supply pipe_class = PIPE_CLASS_UNARY @@ -103,7 +103,7 @@ /datum/fabricator_recipe/pipe/supply/down name = "downward supply pipe fitting" - desc = "a downward supply pipe segment." + desc = "A downward supply pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/supply rotate_class = PIPE_ROTATE_STANDARD @@ -117,18 +117,18 @@ pipe_class = PIPE_CLASS_BINARY name = "scrubber pipe fitting" - desc = "a straight scrubber pipe segment" + desc = "A straight scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/scrubber/bent name = "bent scrubber pipe fitting" - desc = "a bent scrubber pipe segment" + desc = "A bent scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/scrubber/manifold name = "scrubber pipe manifold fitting" - desc = "a scrubber pipe manifold segment" + desc = "A scrubber pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers pipe_class = PIPE_CLASS_TRINARY @@ -136,7 +136,7 @@ /datum/fabricator_recipe/pipe/scrubber/manifold4w name = "four-way scrubber pipe manifold fitting" - desc = "a four-way scrubber pipe manifold segment" + desc = "A four-way scrubber pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers pipe_class = PIPE_CLASS_QUATERNARY @@ -144,7 +144,7 @@ /datum/fabricator_recipe/pipe/scrubber/cap name = "scrubber pipe cap fitting" - desc = "a pipe cap for a scrubber pipe." + desc = "A pipe cap for a scrubber pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers pipe_class = PIPE_CLASS_UNARY @@ -159,7 +159,7 @@ /datum/fabricator_recipe/pipe/scrubber/down name = "downward scrubber pipe fitting" - desc = "a downward scrubber pipe segment." + desc = "A downward scrubber pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers rotate_class = PIPE_ROTATE_STANDARD @@ -173,18 +173,18 @@ pipe_class = PIPE_CLASS_BINARY name = "fuel pipe fitting" - desc = "a striaght fuel pipe segment" + desc = "A straight fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/fuel/bent name = "bent fuel pipe fitting" - desc = "a bent fuel pipe segment" + desc = "A bent fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/fuel/manifold name = "fuel pipe manifold fitting" - desc = "a fuel pipe manifold segment" + desc = "A fuel pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/fuel pipe_class = PIPE_CLASS_TRINARY @@ -192,7 +192,7 @@ /datum/fabricator_recipe/pipe/fuel/manifold4w name = "four-way supply pipe manifold fitting" - desc = "a four-way fuel pipe manifold segment" + desc = "A four-way fuel pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel pipe_class = PIPE_CLASS_QUATERNARY @@ -200,7 +200,7 @@ /datum/fabricator_recipe/pipe/fuel/cap name = "fuel pipe cap fitting" - desc = "a pipe cap for a fuel pipe." + desc = "A pipe cap for a fuel pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/fuel pipe_class = PIPE_CLASS_UNARY @@ -215,7 +215,7 @@ /datum/fabricator_recipe/pipe/fuel/down name = "downward fuel pipe fitting" - desc = "a downward fuel pipe segment." + desc = "A downward fuel pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/fuel rotate_class = PIPE_ROTATE_STANDARD @@ -229,13 +229,13 @@ pipe_class = PIPE_CLASS_BINARY name = "heat exchanger pipe fitting" - desc = "a heat exchanger pipe segment" + desc = "A heat exchanger pipe segment." build_icon_state = "he" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/he/bent name = "bent heat exchanger pipe fitting" - desc = "a bent heat exchanger pipe segment" + desc = "A bent heat exchanger pipe segment." connect_types = CONNECT_TYPE_HE rotate_class = PIPE_ROTATE_TWODIR build_icon_state = "he" @@ -243,7 +243,7 @@ /datum/fabricator_recipe/pipe/he/junction name = "heat exchanger junction" - desc = "a heat exchanger junction" + desc = "A heat exchanger junction." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE|CONNECT_TYPE_FUEL build_icon_state = "junction" constructed_path = /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction @@ -251,7 +251,7 @@ /datum/fabricator_recipe/pipe/he/exchanger name = "heat exchanger" - desc = "a heat exchanger" + desc = "A heat exchanger." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "heunary" constructed_path = /obj/machinery/atmospherics/unary/heat_exchanger From 25a1734535f54581b818be64d81fe3b748b343ae Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 16:30:30 -0500 Subject: [PATCH 029/133] Fix grammar issues in a handful of descriptions --- code/datums/extensions/storage/subtypes_mre.dm | 2 +- code/game/machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/embedded_controller/tin_can.dm | 2 +- code/game/objects/items/blueprints.dm | 8 ++++---- code/game/objects/items/devices/gps.dm | 2 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/gift_wrappaper.dm | 2 +- code/game/objects/items/weapons/implants/implantpad.dm | 2 +- .../objects/items/weapons/implants/implants/translator.dm | 2 +- code/game/objects/items/weapons/material/misc.dm | 2 +- code/game/objects/items/weapons/storage/backpack.dm | 2 +- code/modules/clothing/head/collectable.dm | 2 +- code/modules/clothing/pants/misc.dm | 2 +- code/modules/clothing/spacesuits/rig/suits/light.dm | 2 +- code/modules/events/meteors.dm | 2 +- code/modules/integrated_electronics/subtypes/access.dm | 2 +- .../modules/integrated_electronics/subtypes/converters.dm | 2 ++ code/modules/locks/lock_construct.dm | 2 +- code/modules/mob/living/simple_animal/crow/crow.dm | 2 +- .../simple_animal/hostile/commanded/nanomachines.dm | 2 +- code/modules/reagents/reagent_containers/drinks/bottle.dm | 2 +- code/modules/reagents/reagent_containers/drinks/cans.dm | 2 +- code/modules/reagents/reagent_containers/food/rotten.dm | 3 +-- 23 files changed, 27 insertions(+), 26 deletions(-) diff --git a/code/datums/extensions/storage/subtypes_mre.dm b/code/datums/extensions/storage/subtypes_mre.dm index b5045c1fc1b2..696f0343718f 100644 --- a/code/datums/extensions/storage/subtypes_mre.dm +++ b/code/datums/extensions/storage/subtypes_mre.dm @@ -20,7 +20,7 @@ /datum/storage/mrebag/open(mob/user) if(!opened) - to_chat(user, "The pouch heats up as you break the vaccum seal.") + to_chat(user, "The pouch heats up as you break the vacuum seal.") . = ..() /datum/storage/mrebag/dessert diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 6533978f8529..dbca57d4ca78 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -17,7 +17,7 @@ var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken /obj/item/stock_parts/circuitboard/airlock_electronics/secure name = "secure airlock electronics" - desc = "designed to be somewhat more resistant to hacking than standard electronics." + desc = "Airlock control electronics, designed to be somewhat more resistant to hacking than standard electronics." origin_tech = @'{"programming":2}' secure = TRUE diff --git a/code/game/machinery/embedded_controller/tin_can.dm b/code/game/machinery/embedded_controller/tin_can.dm index d2cada82a3d4..895f15cbaf79 100644 --- a/code/game/machinery/embedded_controller/tin_can.dm +++ b/code/game/machinery/embedded_controller/tin_can.dm @@ -54,7 +54,7 @@ return state = STATE_EVACUATE toggleDoor(memory["exterior_status"], tag_exterior_door, door_safety, "close") - signalPump(tag_pump_out_internal, 1, 0, 0) // Interior pump, target is a vaccum + signalPump(tag_pump_out_internal, 1, 0, 0) // Interior pump, target is a vacuum signalPump(tag_pump_out_external, 1, 1, 10000) // Exterior pump, target is infinite if("fill_atmos") if(state == STATE_FILL) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 5a082bb9180c..8d9e6d3d06b9 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -55,7 +55,7 @@ if(istype(T) && length(global.using_map.overmap_ids)) var/obj/effect/overmap/visitable/sector/S = global.overmap_sectors[num2text(T.z)] if(!S) // The blueprints are useless now, but keep them around for fluff. - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE name += " - [S.name]" @@ -91,7 +91,7 @@ for(var/obj/effect/overmap/visitable/sector/planetoid/E in map) valid_z_levels |= E.map_z return TRUE - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE //For use on /obj/effect/overmap/visitable/ship/landable ships. @@ -111,7 +111,7 @@ area_prefix = S.name return TRUE // The blueprints are useless now, but keep them around for fluff. - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." return FALSE /obj/item/blueprints/shuttle/proc/update_linked_name(atom/namee, old_name, new_name) @@ -122,7 +122,7 @@ events_repository.unregister(/decl/observ/name_set, destroyed, src, PROC_REF(update_linked_name)) events_repository.unregister(/decl/observ/destroyed, destroyed, src, PROC_REF(on_shuttle_destroy)) name = initial(name) - desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your wherabouts." + desc = "Some dusty old blueprints. The markings are old, and seem entirely irrelevant for your whereabouts." valid_z_levels = list() area_prefix = null diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 4508758e19d3..7704fb75550a 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -1,7 +1,7 @@ var/global/list/all_gps_units = list() /obj/item/gps name = "global coordinate system" - desc = "A handheld relay used to triangulates the approximate co-ordinates of the device." + desc = "A handheld relay used to triangulate the approximate coordinates of the device in spacetime." icon = 'icons/obj/items/device/locator.dmi' icon_state = ICON_STATE_WORLD origin_tech = @'{"materials":2,"programming":2,"wormholes":2}' diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 8c88b8edc0df..e41bd958bf21 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -166,7 +166,7 @@ /obj/item/trash/stick name = "stick" - desc = "a stick from some snack food item or a lollipop, not even useful as crafting material." + desc = "A stick from some snack food item or a lollipop, not even useful as crafting material." icon_state = "stick" /obj/item/trash/use_on_mob(mob/living/target, mob/living/user, animate = TRUE) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index a59f5ec44ba6..62f1c7e3fe4a 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -9,7 +9,7 @@ */ /obj/item/a_gift name = "gift" - desc = "PRESENTS!!!! eek!" + desc = "PRESENTS!!!! Eek!" icon = 'icons/obj/items/gift_wrapped.dmi' icon_state = "gift" item_state = "gift" diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 7f1226b1eaea..a2b1afb11fb4 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -1,6 +1,6 @@ /obj/item/implantpad name = "implant pad" - desc = "Used to reprogramm implants." + desc = "Used to reprogram implants." icon = 'icons/obj/items/implant/implantpad.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/weapons/implants/implants/translator.dm b/code/game/objects/items/weapons/implants/implants/translator.dm index 90220204ae8b..f4c540ddb7d4 100644 --- a/code/game/objects/items/weapons/implants/implants/translator.dm +++ b/code/game/objects/items/weapons/implants/implants/translator.dm @@ -41,7 +41,7 @@ /obj/item/implant/translator/natural name = "lingophagic node" - desc = "A chunk of what could be discolored crystalized brain matter. It seems to pulse occasionally." + desc = "A chunk of what could be discolored crystallized brain matter. It seems to pulse occasionally." icon_state = "implant_melted" origin_tech = @'{"biotech":5}' learning_threshold = 10 diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 8040747110e6..3715ccf13ea0 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -37,7 +37,7 @@ /obj/item/harpoon/bomb/proc/handle_afterbomb() spent = TRUE SetName("broken harpoon") - desc = "A short spear with just a barb - if it once had a spearhead, it doesn't any more." + desc = "A short spear with just a barb; if it once had a spearhead, it doesn't anymore." icon_state = "harpoon_bomb_spent" sharp = FALSE edge = FALSE diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index fb4d2bb67566..7a234732c98e 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -410,7 +410,7 @@ /obj/item/backpack/messenger/chem name = "pharmacy messenger bag" - desc = "A serile backpack worn over one shoulder. This one is in Chemistry colors." + desc = "A sterile backpack worn over one shoulder. This one is in Chemistry colors." icon = 'icons/obj/items/storage/backpack/messenger_chem.dmi' /obj/item/backpack/messenger/med diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 4c51dbe3bb9a..c14e8d495da1 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -8,7 +8,7 @@ /obj/item/clothing/head/collectable/petehat name = "ultra rare hat" - desc = "an ultra rare hat. It commands a certain respect." + desc = "An ultra rare hat. It commands a certain respect." icon = 'icons/clothing/head/pete.dmi' /obj/item/clothing/head/collectable/xenom diff --git a/code/modules/clothing/pants/misc.dm b/code/modules/clothing/pants/misc.dm index 766522826607..9fa43b93a094 100644 --- a/code/modules/clothing/pants/misc.dm +++ b/code/modules/clothing/pants/misc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/pants/fire_overpants name = "fire overpants" - desc = "some overpants made of fire-resistant synthetic fibers. To be worn over the uniform." + desc = "Some overpants made of fire-resistant synthetic fibers, worn over one's uniform." icon = 'icons/clothing/pants/overpants.dmi' gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm index 61612dc84e6a..7d705a242a14 100644 --- a/code/modules/clothing/spacesuits/rig/suits/light.dm +++ b/code/modules/clothing/spacesuits/rig/suits/light.dm @@ -47,7 +47,7 @@ icon = 'icons/clothing/rigs/rig_hacker.dmi' req_access = list(access_hacked) airtight = 0 - seal_delay = 5 //not being vaccum-proof has an upside I guess + seal_delay = 5 //not being vacuum-proof has an upside I guess helmet = /obj/item/clothing/head/lightrig/hacker chest = /obj/item/clothing/suit/lightrig/hacker diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 739666996062..521a4bbb2f2c 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -431,7 +431,7 @@ var/global/list/meteors_major = list( //Missiles, for events and so on /obj/effect/meteor/destroyer/missile name = "photon torpedo" - desc = "An advanded warhead designed to tactically destroy space installations." + desc = "An advanced warhead designed to tactically destroy space installations." icon = 'icons/obj/missile.dmi' icon_state = "photon" meteordrop = null diff --git a/code/modules/integrated_electronics/subtypes/access.dm b/code/modules/integrated_electronics/subtypes/access.dm index ef601575bd94..11e008e93df5 100644 --- a/code/modules/integrated_electronics/subtypes/access.dm +++ b/code/modules/integrated_electronics/subtypes/access.dm @@ -43,7 +43,7 @@ /obj/item/integrated_circuit/output/access_displayer name = "access circuit" - desc = "broadcasts access for your assembly via a passkey." + desc = "A circuit that broadcasts access for your assembly via a passkey." extended_desc = "Useful for moving drones through airlocks." complexity = 4 diff --git a/code/modules/integrated_electronics/subtypes/converters.dm b/code/modules/integrated_electronics/subtypes/converters.dm index 1d125d29c248..a60490767894 100644 --- a/code/modules/integrated_electronics/subtypes/converters.dm +++ b/code/modules/integrated_electronics/subtypes/converters.dm @@ -109,6 +109,7 @@ /obj/item/integrated_circuit/converter/lowercase name = "lowercase string converter" + // i'm not fixing the capitalization here to fit style guides because it's funny actually desc = "this circuit will cause a string to come out in all lowercase." icon_state = "lowercase" inputs = list("input" = IC_PINTYPE_STRING) @@ -128,6 +129,7 @@ /obj/item/integrated_circuit/converter/uppercase name = "uppercase string converter" + // see capitalization note above desc = "THIS WILL CAUSE A STRING TO COME OUT IN ALL UPPERCASE." icon_state = "uppercase" inputs = list("input" = IC_PINTYPE_STRING) diff --git a/code/modules/locks/lock_construct.dm b/code/modules/locks/lock_construct.dm index a1060c0063db..0a27464efde2 100644 --- a/code/modules/locks/lock_construct.dm +++ b/code/modules/locks/lock_construct.dm @@ -1,6 +1,6 @@ /obj/item/lock_construct name = "lock" - desc = "a simple tumbler lock and bolt, suitable for affixing to a door or closet." + desc = "A simple tumbler lock and bolt, suitable for affixing to a door or closet." icon = 'icons/obj/items/doorlock.dmi' icon_state = "lock_construct" w_class = ITEM_SIZE_TINY diff --git a/code/modules/mob/living/simple_animal/crow/crow.dm b/code/modules/mob/living/simple_animal/crow/crow.dm index 66428209454e..1c780c3299aa 100644 --- a/code/modules/mob/living/simple_animal/crow/crow.dm +++ b/code/modules/mob/living/simple_animal/crow/crow.dm @@ -80,7 +80,7 @@ /mob/living/simple_animal/crow/cyber name = "cybercrow" - desc = "A large cybercrow. k4w k4w." + desc = "A large cybercrow. K4w k4w." speak_emote = list("beeps") /mob/living/simple_animal/crow/cyber/on_update_icon() diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm index 1145b90b6e8b..330f1afffc4d 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/nanomachines.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/commanded/nanomachine name = "swarm" - desc = "a cloud of tiny, tiny robots." + desc = "A cloud of tiny, tiny robots." icon = 'icons/mob/simple_animal/nanomachines.dmi' natural_weapon = /obj/item/natural_weapon/nanomachine max_health = 10 diff --git a/code/modules/reagents/reagent_containers/drinks/bottle.dm b/code/modules/reagents/reagent_containers/drinks/bottle.dm index 56e5f6b47206..54d4516579af 100644 --- a/code/modules/reagents/reagent_containers/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/drinks/bottle.dm @@ -409,7 +409,7 @@ /obj/item/chems/drinks/bottle/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "colabottle" center_of_mass = @'{"x":16,"y":6}' diff --git a/code/modules/reagents/reagent_containers/drinks/cans.dm b/code/modules/reagents/reagent_containers/drinks/cans.dm index 7c2dbb14dd63..3b0974dd6e3a 100644 --- a/code/modules/reagents/reagent_containers/drinks/cans.dm +++ b/code/modules/reagents/reagent_containers/drinks/cans.dm @@ -12,7 +12,7 @@ /obj/item/chems/drinks/cans/cola name = "\improper Space Cola" - desc = "Cola. in space." + desc = "Cola... in space." icon_state = "cola" center_of_mass = @'{"x":16,"y":10}' diff --git a/code/modules/reagents/reagent_containers/food/rotten.dm b/code/modules/reagents/reagent_containers/food/rotten.dm index 22e15e4dea1c..4115b5d05dee 100644 --- a/code/modules/reagents/reagent_containers/food/rotten.dm +++ b/code/modules/reagents/reagent_containers/food/rotten.dm @@ -1,8 +1,7 @@ //inedible old vendor food - +//filled with inedible and possibly dangerous chemicals /obj/item/food/old name = "master old-food" - desc = "they're all inedible and potentially dangerous items" center_of_mass = @'{"x":15,"y":12}' nutriment_desc = list("rot" = 5, "mold" = 5) nutriment_amt = 10 From f55c4268c00b6f1ca7f8f8a5151e4868d11b6ae7 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 16:33:16 -0500 Subject: [PATCH 030/133] Replace 'recieve' with 'receive' and 'reciept' with 'receipt' --- code/__defines/bodytype.dm | 2 +- code/_helpers/unsorted.dm | 2 +- code/_onclick/click.dm | 2 +- code/_onclick/drag_drop.dm | 2 +- code/controllers/communications.dm | 6 +++--- code/controllers/subsystems/vote.dm | 2 +- code/datums/config/config_types/config_client.dm | 2 +- .../datums/extensions/storage/subtypes_sheets.dm | 2 +- code/datums/wires/radio.dm | 2 +- code/game/antagonist/antagonist_objectives.dm | 2 +- .../stock_parts/network_receiver.dm | 2 +- .../stock_parts/radio/stock_parts_radio.dm | 2 +- .../stock_parts/stock_parts_interface.dm | 2 +- .../embedded_controller/docking_program.dm | 2 +- code/game/machinery/supplybeacon.dm | 2 +- code/modules/admin/verbs/adminpm.dm | 16 ++++++++-------- code/modules/events/money_lotto.dm | 2 +- code/modules/mob/skills/skill_verbs.dm | 2 +- .../file_system/programs/generic/supply.dm | 2 +- .../file_system/reports/report.dm | 2 +- code/modules/nano/nanoui.dm | 4 ++-- code/modules/paperwork/adminpaper.dm | 2 +- code/modules/power/solar.dm | 4 ++-- code/modules/shuttles/shuttle_console.dm | 2 +- code/modules/shuttles/shuttle_emergency.dm | 2 +- code/modules/shuttles/shuttle_log.dm | 2 +- code/modules/species/species.dm | 2 +- maps/away/unishi/unishi.dm | 2 +- maps/exodus/exodus-2.dmm | 2 +- mods/content/supermatter/datums/sm_codex.dm | 2 +- mods/content/xenobiology/slime/items.dm | 2 +- mods/gamemodes/cult/structures.dm | 2 +- mods/gamemodes/ninja/objects/rigsuit.dm | 2 +- nano/templates/request_console.tmpl | 2 +- 34 files changed, 45 insertions(+), 45 deletions(-) diff --git a/code/__defines/bodytype.dm b/code/__defines/bodytype.dm index a44b77cc47ff..ca9dccfe6082 100644 --- a/code/__defines/bodytype.dm +++ b/code/__defines/bodytype.dm @@ -18,7 +18,7 @@ // Bodytype feature flags /// Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN. #define BODY_FLAG_NO_DNA BITFLAG(0) -/// Cannot suffer halloss/recieves deceptive health indicator. +/// Cannot suffer halloss/receives deceptive health indicator. #define BODY_FLAG_NO_PAIN BITFLAG(1) /// Cannot eat food/drink drinks even if a stomach organ is present. #define BODY_FLAG_NO_EAT BITFLAG(2) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index 88f8f402528e..02c769ae10af 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -275,7 +275,7 @@ Turf and target are seperate in case you want to teleport some distance from a t return 0 return 1 -//Ensure the frequency is within bounds of what it should be sending/recieving at +//Ensure the frequency is within bounds of what it should be sending/receiving at /proc/sanitize_frequency(var/f, var/low = PUBLIC_LOW_FREQ, var/high = PUBLIC_HIGH_FREQ) return clamp(round(f), low, high) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 90653cccc970..372ede052d3c 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -41,7 +41,7 @@ After that, mostly just check your state, check whether you're holding an item, check whether you're adjacent to the target, then pass off the click to whoever - is recieving it. + is receiving it. The most common are: * mob/UnarmedAttack(atom,adjacent) - used here only when adjacent, with no item in hand; in the case of humans, checks gloves * atom/attackby(item,user) - used only when adjacent diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index ec0965a969f3..9102b1b0e88e 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -1,6 +1,6 @@ /* The below procs are called on the atom you're dragging. In a lot of circumstances we want to use the - recieving object instead, so that's the default action. This allows you to drag + receiving object instead, so that's the default action. This allows you to drag almost anything into a trash can. */ diff --git a/code/controllers/communications.dm b/code/controllers/communications.dm index d91f03f89eed..05694e4565d7 100644 --- a/code/controllers/communications.dm +++ b/code/controllers/communications.dm @@ -94,13 +94,13 @@ var/global/const/EXTERNAL_AIR_FREQ = 1381 // Used by some external airlocks. //Other devices can then choose to send signals to only those devices that belong to a particular filter. //This is done for performance, so we don't send signals to lots of machines unnecessarily. -//This filter is special because devices belonging to default also recieve signals sent to any other filter. +//This filter is special because devices belonging to default also receive signals sent to any other filter. var/global/const/RADIO_DEFAULT = "radio_default" -//This filter is special because devices belonging to it do not recieve any signals at all. Useful for devices which only transmit. +//This filter is special because devices belonging to it do not receive any signals at all. Useful for devices which only transmit. var/global/const/RADIO_NULL = "radio_null" var/global/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms -var/global/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms +var/global/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in receiving signals from air alarms var/global/const/RADIO_CHAT = "radio_telecoms" var/global/const/RADIO_ATMOSIA = "radio_atmos" var/global/const/RADIO_NAVBEACONS = "radio_navbeacon" diff --git a/code/controllers/subsystems/vote.dm b/code/controllers/subsystems/vote.dm index fb2a258791c9..5acccf7afe08 100644 --- a/code/controllers/subsystems/vote.dm +++ b/code/controllers/subsystems/vote.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(vote) var/list/old_votes //Stores completed votes for reference. var/queued_auto_vote //Used if a vote queues another vote to happen after it. - var/list/voting = list() //Clients recieving UI updates. + var/list/voting = list() //Clients receiving UI updates. var/list/vote_prototypes //To run checks on whether they are available. /datum/controller/subsystem/vote/Initialize() diff --git a/code/datums/config/config_types/config_client.dm b/code/datums/config/config_types/config_client.dm index 7219bc3189fb..ed8a0224daff 100644 --- a/code/datums/config/config_types/config_client.dm +++ b/code/datums/config/config_types/config_client.dm @@ -51,7 +51,7 @@ /decl/config/toggle/popup_admin_pm uid = "popup_admin_pm" desc = list( - "Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.", + "Remove the # to show a popup 'reply to' window to every non-admin that receives an adminPM.", "The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)." ) diff --git a/code/datums/extensions/storage/subtypes_sheets.dm b/code/datums/extensions/storage/subtypes_sheets.dm index a72c49ab856d..578282c8d4b9 100644 --- a/code/datums/extensions/storage/subtypes_sheets.dm +++ b/code/datums/extensions/storage/subtypes_sheets.dm @@ -77,7 +77,7 @@ return FALSE //I would prefer to drop a new stack, but the item/attack_hand code - // that calls this can't recieve a different object than you clicked on. + // that calls this can't receive a different object than you clicked on. //Therefore, make a new stack internally that has the remainder. // -Sayu diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 22b951263c56..d2d868a4a7d1 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -3,7 +3,7 @@ wire_count = 3 descriptions = list( new /datum/wire_description(WIRE_SIGNAL, "This wire connects several radio components."), - new /datum/wire_description(WIRE_RECEIVE, "This wire runs to the radio reciever.", SKILL_EXPERT), + new /datum/wire_description(WIRE_RECEIVE, "This wire runs to the radio receiver.", SKILL_EXPERT), new /datum/wire_description(WIRE_TRANSMIT, "This wire runs to the radio transmitter.") ) diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 5e0f27068cff..51caf655579f 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -17,7 +17,7 @@ /mob/proc/add_objectives() set name = "Get Objectives" - set desc = "Recieve optional objectives." + set desc = "Receive optional objectives." set category = "OOC" src.verbs -= /mob/proc/add_objectives diff --git a/code/game/machinery/_machines_base/stock_parts/network_receiver.dm b/code/game/machinery/_machines_base/stock_parts/network_receiver.dm index 644941d02cda..1b09080e57c1 100644 --- a/code/game/machinery/_machines_base/stock_parts/network_receiver.dm +++ b/code/game/machinery/_machines_base/stock_parts/network_receiver.dm @@ -1,4 +1,4 @@ -// A reciever that allows for non-network machines to have public vars and methods interacted with by networks +// A receiver that allows for non-network machines to have public vars and methods interacted with by networks /obj/item/stock_parts/network_receiver name = "network receiver" diff --git a/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm b/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm index e1a967194179..9cca4b1b98a1 100644 --- a/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm +++ b/code/game/machinery/_machines_base/stock_parts/radio/stock_parts_radio.dm @@ -24,7 +24,7 @@ id_tag = new_tag set_frequency(frequency, filter) -/obj/item/stock_parts/radio/proc/get_receive_filter() // what filter should we register with to recieve updates on? +/obj/item/stock_parts/radio/proc/get_receive_filter() // what filter should we register with to receive updates on? return RADIO_NULL /obj/item/stock_parts/radio/proc/set_frequency(new_frequency, new_filter) diff --git a/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm b/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm index e56703abc157..bd43db38d6c3 100644 --- a/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm +++ b/code/game/machinery/_machines_base/stock_parts/stock_parts_interface.dm @@ -20,7 +20,7 @@ /obj/item/stock_parts/keyboard name = "input controller" - desc = "A standard part required by many machines to recieve user input." + desc = "A standard part required by many machines to receive user input." icon_state = "input" origin_tech = @'{"materials":1}' material = /decl/material/solid/organic/plastic diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 5a8dbad94e82..8bea52eb0259 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -57,7 +57,7 @@ var/response_sent = 0 //so we don't spam confirmation messages var/override_enabled = 0 //when enabled, do not open/close doors or cycle airlocks and wait for the player to do it manually - var/received_confirm = 0 //for undocking, whether the server has recieved a confirmation from the client + var/received_confirm = 0 //for undocking, whether the server has received a confirmation from the client var/docking_codes //would only allow docking when receiving signal with these, if set var/display_name //how would it show up on docking monitoring program, area name + coordinates if unset diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm index 831363ce53e5..b74a93b635dc 100644 --- a/code/game/machinery/supplybeacon.dm +++ b/code/game/machinery/supplybeacon.dm @@ -101,7 +101,7 @@ target_drop_time = world.time + drop_delay if(world.time >= target_drop_time) deactivate(permanent = TRUE) - command_announcement.Announce("Nyx Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] recieved. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") + command_announcement.Announce("Nyx Rapid Fabrication priority supply request #[rand(1000,9999)]-[rand(100,999)] received. Shipment dispatched via ballistic supply pod for immediate delivery. Have a nice day.", "Thank You For Your Patronage") addtimer(CALLBACK(src, PROC_REF(drop_cargo)), rand(20 SECONDS, 30 SECONDS)) /obj/structure/supply_beacon/proc/drop_cargo(var/drop_x, var/drop_y, var/drop_z) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 7371ff70873f..2ec60c912eb9 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -46,12 +46,12 @@ else to_chat(src, "Error: Private-Message: Client not found. They may have lost connection, so please be patient!") return - var/recieve_pm_type = "Player" + var/receive_pm_type = "Player" if(holder) //mod PMs are maroon //PMs sent from admins and mods display their rank if(holder) - recieve_pm_type = holder.rank + receive_pm_type = holder.rank else if(C && !C.holder) to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") @@ -104,12 +104,12 @@ // We are sending this quite early because of a return in the popup code. SSwebhooks.send(WEBHOOK_AHELP_SENT, list("name" = "Reply Sent ([ticket.id]) (Game ID: [game_id])", "body" = "**[sender_lite.key_name(FALSE, FALSE)]** to **[receiver_lite.key_name(FALSE, FALSE)]**: [msg]")) - var/recieve_message + var/receive_message if(holder && !C.holder) - recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n" + receive_message = "-- Click the [receive_pm_type]'s name to reply --\n" if(C.adminhelped) - to_chat(C, recieve_message) + to_chat(C, receive_message) C.adminhelped = 0 //AdminPM popup for ApocStation and anybody else who wants to use it. @@ -117,7 +117,7 @@ spawn(0) //so we don't hold the caller proc up var/sender = src var/sendername = key - var/reply = sanitize(input(C, msg,"[recieve_pm_type] PM from [sendername]", "") as text|null) //show message and await a reply + var/reply = sanitize(input(C, msg,"[receive_pm_type] PM from [sendername]", "") as text|null) //show message and await a reply if(C && reply) if(sender) C.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them @@ -134,7 +134,7 @@ sender_message += "" to_chat(src, sender_message) - var/receiver_message = "" + create_text_tag("pm_in", "", C) + " \[[recieve_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" + var/receiver_message = "" + create_text_tag("pm_in", "", C) + " \[[receive_pm_type] PM\] [get_options_bar(src, C.holder ? 1 : 0, C.holder ? 1 : 0, 1)]" if(C.holder) receiver_message += " ([(ticket.status == TICKET_OPEN) ? "TAKE" : "JOIN"]) (CLOSE)" receiver_message += ": [generate_ahelp_key_words(C.mob, msg)]" @@ -145,7 +145,7 @@ window_flash(C) - //play the recieving admin the adminhelp sound (if they have them enabled) + //play the receiving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this if(C.get_preference_value(/datum/client_preference/staff/play_adminhelp_ping) == PREF_HEAR) sound_to(C, 'sound/effects/adminhelp.ogg') diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm index 0cd4a07d1fbb..7760e51327f6 100644 --- a/code/modules/events/money_lotto.dm +++ b/code/modules/events/money_lotto.dm @@ -20,7 +20,7 @@ var/channel = "Nyx Daily" var/decl/currency/cur = GET_DECL(winner_account?.currency || global.using_map.default_currency) - var/body = "Nyx Daily wishes to congratulate [winner_name] for recieving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" + var/body = "Nyx Daily wishes to congratulate [winner_name] for receiving the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [cur.format_value(winner_sum)]!" if(!deposit_success) body += "
Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. In order to have your winnings re-sent, send a cheque containing a processing fee of [cur.format_value(5000)] to the ND 'Stellar Slam' office on the Nyx gateway with your updated details." winner_account = null diff --git a/code/modules/mob/skills/skill_verbs.dm b/code/modules/mob/skills/skill_verbs.dm index 36be6e7adfec..fc051b139594 100644 --- a/code/modules/mob/skills/skill_verbs.dm +++ b/code/modules/mob/skills/skill_verbs.dm @@ -88,7 +88,7 @@ Robots and antags can instruct. return if(target.too_many_buffs(/datum/skill_buff/instruct)) var/decl/pronouns/pronouns = target.get_pronouns(ignore_coverings = TRUE) - to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] recieved.")) + to_chat(src, SPAN_WARNING("\The [target] [pronouns.is] exhausted from all the training [pronouns.he] received.")) return if(!get_options) diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 39f092d64a6a..b0f425734159 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -395,7 +395,7 @@ return var/t = "" - t += "

[global.using_map.station_name] Supply Requisition Reciept

" + t += "

[global.using_map.station_name] Supply Requisition Receipt

" t += "INDEX: #[O.ordernum]
" t += "REQUESTED BY: [O.orderedby]
" t += "ASSIGNMENT: [O.orderedrank]
" diff --git a/code/modules/modular_computers/file_system/reports/report.dm b/code/modules/modular_computers/file_system/reports/report.dm index efb782c507fc..7d391fbb982c 100644 --- a/code/modules/modular_computers/file_system/reports/report.dm +++ b/code/modules/modular_computers/file_system/reports/report.dm @@ -143,7 +143,7 @@ no_html will strip any html, possibly killing useful formatting in the process. if(no_html) . = html2pencode(.) -//recipient reports have a designated recipients field, for recieving submitted reports. +//recipient reports have a designated recipients field, for receiving submitted reports. /datum/computer_file/report/recipient var/datum/report_field/people/list_from_manifest/recipients diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index e315b28c5809..f2125ae38e31 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -388,7 +388,7 @@ nanoui is used to open and update nano browser uis diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm index a7d1cda991a9..d886c4defe19 100644 --- a/code/modules/paperwork/adminpaper.dm +++ b/code/modules/paperwork/adminpaper.dm @@ -57,7 +57,7 @@ text = "
" text += "This transmission is intended only for the addressee and may contain confidential information. Any unauthorized disclosure is strictly prohibited.

" - text += "If this transmission is recieved in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." + text += "If this transmission is received in error, please notify both the sender and the office of [global.using_map.boss_name] Internal Affairs immediately so that corrective action may be taken." text += "Failure to comply is a breach of regulation and may be prosecuted to the fullest extent of the law, where applicable." text += "" diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index a941debb006a..66f77091a280 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -107,7 +107,7 @@ var/global/list/solars_list = list() set_dir(angle2dir(adir)) return -//calculates the fraction of the sunlight that the panel recieves +//calculates the fraction of the sunlight that the panel receives /obj/machinery/power/solar/proc/update_solar_exposure() var/datum/sun/sun = get_best_sun() @@ -125,7 +125,7 @@ var/global/list/solars_list = list() return sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? + //isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? /obj/machinery/power/solar/Process() if(stat & BROKEN) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 422e33e3f0e1..774c5d4bdf09 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -37,7 +37,7 @@ shuttle_status = "Standing-by at [shuttle.get_location_name()]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to \the [shuttle.get_destination_name()]." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index f6efaa4a8645..f78010c50559 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -201,7 +201,7 @@ else shuttle_status = "Standing-by at [global.using_map.dock_name]." if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has recieved command and will depart shortly." + shuttle_status = "Shuttle has received command and will depart shortly." if(WAIT_ARRIVE) shuttle_status = "Proceeding to destination." if(WAIT_FINISH) diff --git a/code/modules/shuttles/shuttle_log.dm b/code/modules/shuttles/shuttle_log.dm index 03d6fe0f3070..8313873b212a 100644 --- a/code/modules/shuttles/shuttle_log.dm +++ b/code/modules/shuttles/shuttle_log.dm @@ -6,7 +6,7 @@ var/list/datum/shuttle_mission/queued_missions = list() //Missions which are queued up, in order ([1] is the next one scheduled). var/datum/shuttle_mission/current_mission //The current mission, planned or ongoing. Will also be in either missions or queued_missions, depending on stage. var/home_base //The landmark tag from which missions originate. - var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to recieve updates. + var/list/datum/nano_module/registered = list() //Nanomodules using logs should register to receive updates. var/last_spam = 0 //Helps with spam control from deck software. /datum/shuttle_log/New(datum/shuttle/given_shuttle) diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 6ef37bd2681e..89e39cae5f0a 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -176,7 +176,7 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200 var/list/base_auras - var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job recieves. + var/job_skill_buffs = list() // A list containing jobs (/datum/job), with values the extra points that job receives. var/standing_jump_range = 2 var/list/maneuvers = list(/decl/maneuver/leap) diff --git a/maps/away/unishi/unishi.dm b/maps/away/unishi/unishi.dm index de64aad2f44c..9883e163758e 100644 --- a/maps/away/unishi/unishi.dm +++ b/maps/away/unishi/unishi.dm @@ -92,7 +92,7 @@ /obj/item/paper/prof2 name = "error log" - info = " COMPUTER ID: 15131
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
Email to iodc@net
To whom it may concern,
I recieved your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2)
Email from fuckyou@12cmal
We have ways of making you comply. " + info = " COMPUTER ID: 15131
Attempting recovery of document directory.
Three files recovered
Printing file (1/2)
Email to iodc@net
To whom it may concern,
I received your email today in regards to the research I am conducting. You have no legal right to question our research or attempt to block it. Per article 323, scientific research is protected information, that you have absolutely zero claim to. The compound is secret in composition, but I can fully promise you that it contains absolutely no proprietary molecules, and thus you have no claim whatsoever to it or the technologies to it. Your threats are laughable at best, and have been forwarded to CTI legal. Do not contact me aga!#!41asjw.
Printing file (2/2)
Email from fuckyou@12cmal
We have ways of making you comply. " /obj/machinery/computer/log_printer name = "Computer" diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm index 059f7cec3441..365bbc97185e 100644 --- a/maps/exodus/exodus-2.dmm +++ b/maps/exodus/exodus-2.dmm @@ -32641,7 +32641,7 @@ tag_door = "cargo_bay_door" }, /obj/machinery/camera/network/civilian_west{ - c_tag = "Cargo Recieving Dock"; + c_tag = "Cargo Receiving Dock"; dir = 4 }, /turf/floor/tiled/steel_grid, diff --git a/mods/content/supermatter/datums/sm_codex.dm b/mods/content/supermatter/datums/sm_codex.dm index c0d5c160faeb..72810edb7a41 100644 --- a/mods/content/supermatter/datums/sm_codex.dm +++ b/mods/content/supermatter/datums/sm_codex.dm @@ -15,7 +15,7 @@
\ Touching the supermatter will result in *instant death*, with no corpse left behind! You can drag the supermatter, but anything else will kill you. \ It is advised to obtain a genetic backup before trying to drag it." - antag_text = "Exposing the supermatter to oxygen or vaccum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ + antag_text = "Exposing the supermatter to oxygen or vacuum will cause it to start rapidly heating up. Sabotaging the supermatter and making it explode will \ cause a period of lag as the explosion is processed by the server, as well as irradiating the entire station and causing hallucinations to happen. \ Wearing radiation equipment will protect you from most of the delamination effects sans explosion." available_to_map_tech_level = MAP_TECH_LEVEL_SPACE \ No newline at end of file diff --git a/mods/content/xenobiology/slime/items.dm b/mods/content/xenobiology/slime/items.dm index 0af184e22c39..da4a21eff12c 100644 --- a/mods/content/xenobiology/slime/items.dm +++ b/mods/content/xenobiology/slime/items.dm @@ -61,7 +61,7 @@ /obj/effect/golemrune anchored = TRUE - desc = "a strange rune used to create golems. It glows when it can be activated." + desc = "A strange rune used to create golems. It glows when it can be activated." name = "rune" icon = 'icons/obj/rune.dmi' icon_state = "golem" diff --git a/mods/gamemodes/cult/structures.dm b/mods/gamemodes/cult/structures.dm index 9f39d61522d6..38bfdda57c09 100644 --- a/mods/gamemodes/cult/structures.dm +++ b/mods/gamemodes/cult/structures.dm @@ -112,7 +112,7 @@ /obj/structure/grille/cult name = "cult grille" - desc = "A matrice built out of an unknown material, with some sort of force field blocking air around it." + desc = "A matrix built out of an unknown material, with some sort of force field blocking air around it." material = /decl/material/solid/stone/cult /obj/structure/grille/cult/CanPass(atom/movable/mover, turf/target, height = 1.5, air_group = 0) diff --git a/mods/gamemodes/ninja/objects/rigsuit.dm b/mods/gamemodes/ninja/objects/rigsuit.dm index 36b47a9aa1ab..7a49651656a8 100644 --- a/mods/gamemodes/ninja/objects/rigsuit.dm +++ b/mods/gamemodes/ninja/objects/rigsuit.dm @@ -1,6 +1,6 @@ /obj/item/rig/light/ninja name = "ominous suit control module" - desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for assassins." + desc = "A unique, vacuum-proof suit of nano-enhanced armor designed specifically for assassins." suit_type = "ominous" icon = 'icons/clothing/rigs/rig_ninja.dmi' armor = list( diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl index 82b27de25d54..4465f223e0d9 100644 --- a/nano/templates/request_console.tmpl +++ b/nano/templates/request_console.tmpl @@ -73,7 +73,7 @@ Used In File(s): \code\game\machinery\requests_console.dm {{for data.message_log}}
{{:value}}
{{empty}} -
No messages have been recieved.
+
No messages have been received.
{{/for}}
{{:helper.link('Back', 'arrowreturnthick-1-w', { 'setScreen' : 0 })}}
From d4a2a8b8332d60fe8708c49b9359ca0a7568e78e Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 18:17:47 -0500 Subject: [PATCH 031/133] Remove redundant pipe fabrication descriptions --- .../fabrication/designs/pipe/pipe_datums.dm | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/code/modules/fabrication/designs/pipe/pipe_datums.dm b/code/modules/fabrication/designs/pipe/pipe_datums.dm index b9aea3517c40..70f0a7c6320c 100644 --- a/code/modules/fabrication/designs/pipe/pipe_datums.dm +++ b/code/modules/fabrication/designs/pipe/pipe_datums.dm @@ -3,18 +3,15 @@ /datum/fabricator_recipe/pipe name = "pipe fitting" - desc = "A straight pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/bent name = "bent pipe fitting" - desc = "A bent pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/manifold name = "pipe manifold fitting" - desc = "A pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden pipe_class = PIPE_CLASS_TRINARY @@ -22,7 +19,6 @@ /datum/fabricator_recipe/pipe/manifold4w name = "four-way pipe manifold fitting" - desc = "A four-way pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden pipe_class = PIPE_CLASS_QUATERNARY @@ -30,7 +26,6 @@ /datum/fabricator_recipe/pipe/cap name = "pipe cap fitting" - desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden pipe_class = PIPE_CLASS_UNARY @@ -38,7 +33,6 @@ /datum/fabricator_recipe/pipe/up name = "upward pipe fitting" - desc = "an upward pipe." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up rotate_class = PIPE_ROTATE_STANDARD @@ -46,7 +40,6 @@ /datum/fabricator_recipe/pipe/down name = "downward pipe fitting" - desc = "A downward pipe." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down rotate_class = PIPE_ROTATE_STANDARD @@ -61,18 +54,15 @@ pipe_class = PIPE_CLASS_BINARY name = "supply pipe fitting" - desc = "A straight supply pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/bent name = "bent supply pipe fitting" - desc = "A bent supply pipe segment." dir = PIPE_BENT rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/supply/manifold name = "supply pipe manifold fitting" - desc = "A supply pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/supply pipe_class = PIPE_CLASS_TRINARY @@ -80,7 +70,6 @@ /datum/fabricator_recipe/pipe/supply/manifold4w name = "four-way supply pipe manifold fitting" - desc = "A four-way supply pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply pipe_class = PIPE_CLASS_QUATERNARY @@ -88,7 +77,6 @@ /datum/fabricator_recipe/pipe/supply/cap name = "supply pipe cap fitting" - desc = "A pipe cap for a regular pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/supply pipe_class = PIPE_CLASS_UNARY @@ -96,14 +84,12 @@ /datum/fabricator_recipe/pipe/supply/up name = "upward supply pipe fitting" - desc = "an upward supply pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/supply rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/supply/down name = "downward supply pipe fitting" - desc = "A downward supply pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/supply rotate_class = PIPE_ROTATE_STANDARD @@ -117,18 +103,15 @@ pipe_class = PIPE_CLASS_BINARY name = "scrubber pipe fitting" - desc = "A straight scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/scrubber/bent name = "bent scrubber pipe fitting" - desc = "A bent scrubber pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/scrubber/manifold name = "scrubber pipe manifold fitting" - desc = "A scrubber pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers pipe_class = PIPE_CLASS_TRINARY @@ -136,7 +119,6 @@ /datum/fabricator_recipe/pipe/scrubber/manifold4w name = "four-way scrubber pipe manifold fitting" - desc = "A four-way scrubber pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers pipe_class = PIPE_CLASS_QUATERNARY @@ -144,7 +126,6 @@ /datum/fabricator_recipe/pipe/scrubber/cap name = "scrubber pipe cap fitting" - desc = "A pipe cap for a scrubber pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/scrubbers pipe_class = PIPE_CLASS_UNARY @@ -152,14 +133,12 @@ /datum/fabricator_recipe/pipe/scrubber/up name = "upward scrubber pipe fitting" - desc = "an upward scrubber pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/scrubber/down name = "downward scrubber pipe fitting" - desc = "A downward scrubber pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers rotate_class = PIPE_ROTATE_STANDARD @@ -173,18 +152,15 @@ pipe_class = PIPE_CLASS_BINARY name = "fuel pipe fitting" - desc = "A straight fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/fuel/bent name = "bent fuel pipe fitting" - desc = "A bent fuel pipe segment." rotate_class = PIPE_ROTATE_TWODIR dir = PIPE_BENT /datum/fabricator_recipe/pipe/fuel/manifold name = "fuel pipe manifold fitting" - desc = "A fuel pipe manifold segment." build_icon_state = "manifold" constructed_path = /obj/machinery/atmospherics/pipe/manifold/hidden/fuel pipe_class = PIPE_CLASS_TRINARY @@ -192,7 +168,6 @@ /datum/fabricator_recipe/pipe/fuel/manifold4w name = "four-way supply pipe manifold fitting" - desc = "A four-way fuel pipe manifold segment." build_icon_state = "manifold4w" constructed_path = /obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel pipe_class = PIPE_CLASS_QUATERNARY @@ -200,7 +175,6 @@ /datum/fabricator_recipe/pipe/fuel/cap name = "fuel pipe cap fitting" - desc = "A pipe cap for a fuel pipe." build_icon_state = "cap" constructed_path = /obj/machinery/atmospherics/pipe/cap/hidden/fuel pipe_class = PIPE_CLASS_UNARY @@ -208,14 +182,12 @@ /datum/fabricator_recipe/pipe/fuel/up name = "upward fuel pipe fitting" - desc = "an upward fuel pipe segment." build_icon_state = "up" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/up/fuel rotate_class = PIPE_ROTATE_STANDARD /datum/fabricator_recipe/pipe/fuel/down name = "downward fuel pipe fitting" - desc = "A downward fuel pipe segment." build_icon_state = "down" constructed_path = /obj/machinery/atmospherics/pipe/zpipe/down/fuel rotate_class = PIPE_ROTATE_STANDARD @@ -229,13 +201,11 @@ pipe_class = PIPE_CLASS_BINARY name = "heat exchanger pipe fitting" - desc = "A heat exchanger pipe segment." build_icon_state = "he" rotate_class = PIPE_ROTATE_TWODIR /datum/fabricator_recipe/pipe/he/bent name = "bent heat exchanger pipe fitting" - desc = "A bent heat exchanger pipe segment." connect_types = CONNECT_TYPE_HE rotate_class = PIPE_ROTATE_TWODIR build_icon_state = "he" @@ -243,7 +213,6 @@ /datum/fabricator_recipe/pipe/he/junction name = "heat exchanger junction" - desc = "A heat exchanger junction." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_HE|CONNECT_TYPE_FUEL build_icon_state = "junction" constructed_path = /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction @@ -251,7 +220,6 @@ /datum/fabricator_recipe/pipe/he/exchanger name = "heat exchanger" - desc = "A heat exchanger." connect_types = CONNECT_TYPE_REGULAR|CONNECT_TYPE_FUEL build_icon_state = "heunary" constructed_path = /obj/machinery/atmospherics/unary/heat_exchanger From 6a488d72770066108db8a72267be4db8e9ff6e04 Mon Sep 17 00:00:00 2001 From: Penelope Haze Date: Sun, 26 Jan 2025 20:50:49 -0500 Subject: [PATCH 032/133] Fix miscellaneous spelling and phrasing issues --- code/__defines/MC.dm | 4 +- code/__defines/machinery.dm | 2 +- code/_helpers/text.dm | 2 +- code/controllers/subsystems/machines.dm | 2 +- code/datums/extensions/storage/_storage.dm | 2 +- code/datums/uplink/ammunition.dm | 4 +- code/datums/uplink/badassery.dm | 2 +- code/datums/uplink/devices_and_tools.dm | 2 +- .../highly_visible_and_dangerous_weapons.dm | 10 ++--- code/datums/uplink/implants.dm | 2 +- code/datums/uplink/medical.dm | 2 +- .../stealthy_and_inconspicuous_weapons.dm | 2 +- code/datums/wires/wires.dm | 2 +- .../_machines_base/machinery_public_vars.dm | 2 +- .../stock_parts/legacy_parts.dm | 2 +- code/game/machinery/alarm.dm | 2 +- .../airlock_controllers_dummy.dm | 2 +- code/game/machinery/mech_recharger.dm | 2 +- code/game/machinery/self_destruct_storage.dm | 2 +- code/game/machinery/vending/food.dm | 2 +- code/game/machinery/washing_machine.dm | 2 +- code/game/objects/items/blackout.dm | 2 +- code/game/objects/items/cryobag.dm | 4 +- code/game/objects/items/devices/aicard.dm | 2 +- code/game/objects/items/devices/boombox.dm | 2 +- .../objects/items/devices/personal_shield.dm | 2 +- .../items/devices/radio/headsets_shared.dm | 4 +- .../flame/flame_fuelled_lighter_zippo.dm | 2 +- .../objects/items/flashlights/floodlamp.dm | 2 +- .../objects/items/flashlights/lavalamp.dm | 18 ++++----- code/game/objects/items/lockpicks.dm | 2 +- code/game/objects/items/paintkit.dm | 4 +- code/game/objects/items/rescuebag.dm | 4 +- .../items/stacks/medical/medical_resin.dm | 4 +- .../objects/items/stacks/tiles/tile_types.dm | 4 +- code/game/objects/items/toys.dm | 14 +++---- code/game/objects/items/waterskin.dm | 2 +- code/game/objects/items/weapons/cards_ids.dm | 2 +- .../items/weapons/circuitboards/wall.dm | 2 +- code/game/objects/items/weapons/defib.dm | 4 +- code/game/objects/items/weapons/dice.dm | 14 +++---- code/game/objects/items/weapons/ecigs.dm | 2 +- .../items/weapons/grenades/flashbang.dm | 2 +- .../objects/items/weapons/material/coins.dm | 2 +- .../objects/items/weapons/material/knives.dm | 2 +- .../objects/items/weapons/material/swiss.dm | 2 +- .../objects/items/weapons/storage/basket.dm | 2 +- .../objects/items/weapons/storage/boxes.dm | 6 +-- .../objects/items/weapons/storage/misc.dm | 4 +- .../objects/items/weapons/tanks/jetpack.dm | 4 +- code/game/objects/random/subtypes/tech.dm | 4 +- code/game/objects/random/subtypes/tools.dm | 4 +- .../structures/chemistry/_chemistry.dm | 2 +- .../crates_lockers/closets/job_closets.dm | 2 +- .../structures/crates_lockers/crates.dm | 6 +-- code/game/objects/structures/crematorium.dm | 2 +- .../structures/signs/department_signs.dm | 10 ++--- code/game/objects/structures/watercloset.dm | 2 +- code/modules/ZAS/Fire.dm | 2 +- code/modules/admin/quantum_mechanic.dm | 2 +- code/modules/admin/verbs/SDQL_2/SDQL_2.dm | 2 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/assembly/mousetrap.dm | 2 +- .../components/binary_devices/pipeturbine.dm | 2 +- .../augment/active/tool/engineering.dm | 4 +- code/modules/augment/passive/boost/muscle.dm | 2 +- code/modules/awaymissions/pamphlet.dm | 2 +- code/modules/bodytype/bodytype_quadruped.dm | 4 +- code/modules/butchery/butchery_products.dm | 2 +- .../butchery/butchery_products_meat.dm | 4 +- code/modules/client/asset_cache.dm | 2 +- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/dresses/misc.dm | 6 +-- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/glasses/sunglasses.dm | 2 +- code/modules/clothing/head/misc.dm | 6 +-- code/modules/clothing/head/misc_special.dm | 4 +- code/modules/clothing/jumpsuits/job.dm | 2 +- code/modules/clothing/masks/breath.dm | 2 +- code/modules/clothing/masks/chewable.dm | 8 ++-- code/modules/clothing/masks/miscellaneous.dm | 2 +- code/modules/clothing/masks/smokable.dm | 4 +- code/modules/clothing/shirts/sweaters.dm | 4 +- code/modules/clothing/shirts/syndicate.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 2 +- code/modules/clothing/skirts/job.dm | 2 +- .../clothing/spacesuits/rig/modules/combat.dm | 2 +- .../spacesuits/rig/modules/computer.dm | 4 +- .../spacesuits/rig/modules/modules.dm | 2 +- code/modules/clothing/spacesuits/rig/rig.dm | 4 +- code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/dashiki.dm | 6 +-- code/modules/clothing/suits/labcoat.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 3 +- code/modules/clothing/suits/wizard.dm | 2 +- code/modules/clothing/webbing/misc.dm | 2 +- .../codex/categories/category_surgery.dm | 2 +- code/modules/codex/entries/guides.dm | 2 +- code/modules/codex/entries/medical.dm | 4 +- code/modules/detectivework/tools/crimekit.dm | 2 +- code/modules/fabrication/_fabricator.dm | 2 +- code/modules/food/plates/plate_tray.dm | 4 +- code/modules/games/boardgame.dm | 2 +- code/modules/games/cards.dm | 4 +- code/modules/gemstones/gemstone_cuts.dm | 2 +- .../integrated_electronics/subtypes/access.dm | 2 +- .../subtypes/manipulation.dm | 4 +- .../subtypes/reagents.dm | 2 +- .../integrated_electronics/subtypes/smart.dm | 2 +- .../random_exoplanet/planet_types/shrouded.dm | 2 +- .../random_exoplanet/planetoid_data.dm | 2 +- .../gasses/material_gas_mundane.dm | 4 +- .../liquids/materials_liquid_chemistry.dm | 4 +- .../liquids/materials_liquid_solvents.dm | 2 +- code/modules/mechs/components/armour.dm | 6 +-- code/modules/mechs/equipment/medical.dm | 2 +- code/modules/mechs/mech_wreckage.dm | 2 +- code/modules/mob/language/synthetic.dm | 2 +- code/modules/mob/living/human/human_verbs.dm | 2 +- code/modules/mob/living/human/life.dm | 2 +- code/modules/mob/living/living.dm | 4 +- .../modules/mob/living/silicon/ai/ai_radio.dm | 2 +- code/modules/mob/living/silicon/ai/power.dm | 4 +- .../living/silicon/robot/drone/drone_say.dm | 2 +- .../mob/living/silicon/robot/robot_items.dm | 2 +- .../hostile/retaliate/exoplanet.dm | 2 +- code/modules/mob/mob.dm | 2 +- .../mob/observer/eye/freelook/chunk.dm | 2 +- .../computers/subtypes/dev_holo.dm | 2 +- .../programs/research/ai_restorer.dm | 2 +- .../modular_computers/hardware/ai_slot.dm | 8 ++-- .../hardware/battery_module.dm | 12 +++--- .../hardware/network_card.dm | 2 +- .../hardware/processor_unit.dm | 4 +- .../modular_computers/terminal/terminal.dm | 2 +- code/modules/nano/interaction/default.dm | 4 +- .../modules/organs/internal/brain_computer.dm | 2 +- code/modules/organs/organ.dm | 2 +- .../overmap/ships/computers/sensors.dm | 2 +- .../overmap/ships/machines/fusion_thruster.dm | 2 +- .../overmap/ships/machines/gas_thruster.dm | 2 +- code/modules/power/apc.dm | 2 +- code/modules/power/cell.dm | 6 +-- code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/port_gen.dm | 2 +- code/modules/power/smes_construction.dm | 4 +- .../projectiles/guns/energy/capacitor.dm | 2 +- .../projectiles/guns/launcher/foam_gun.dm | 4 +- .../projectiles/guns/launcher/syringe_gun.dm | 2 +- .../projectiles/guns/projectile/shotgun.dm | 2 +- code/modules/reagents/Chemistry-Holder.dm | 10 ++--- code/modules/reagents/chems/chems_alcohol.dm | 10 ++--- code/modules/reagents/cocktails.dm | 4 +- .../reagents/reagent_containers/borghydro.dm | 2 +- .../reagent_containers/drinks/bottle.dm | 2 +- .../drinks/cocktailshaker.dm | 2 +- .../reagent_containers/food/canned/_canned.dm | 2 +- .../reagent_containers/food/dairy/cheeses.dm | 2 +- .../reagent_containers/food/junkfood.dm | 4 +- .../reagents/reagent_containers/food/pasta.dm | 2 +- .../food/sliceable/cakes.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 6 +-- .../reagents/reagent_containers/retort.dm | 2 +- code/modules/recycling/conveyor2.dm | 2 +- code/modules/research/research_fields.dm | 2 +- code/modules/sealant_gun/sealant_gun.dm | 2 +- code/modules/shuttles/shuttle.dm | 4 +- code/modules/shuttles/shuttle_ferry.dm | 2 +- code/modules/shuttles/shuttle_log.dm | 10 ++--- code/modules/surgery/crystal.dm | 2 +- .../real_instruments/Trumpet/trumpet.dm | 2 +- code/modules/tools/subtypes/power_tools.dm | 2 +- code/modules/vehicles/cargo_train.dm | 2 +- .../xenoarcheaology/finds/strange_rock.dm | 2 +- maps/away/liberia/liberia_areas.dm | 4 +- maps/away/magshield/magshield.dm | 4 +- maps/away/unishi/unishi_jobs.dm | 4 +- maps/ministation/ministation_antagonists.dm | 2 +- .../exoplanet_ruins/monoliths/monoliths.dm | 2 +- maps/~mapsystem/maps.dm | 4 +- mods/content/corporate/items/medals.dm | 2 +- mods/content/dungeon_loot/subtypes/exosuit.dm | 6 +-- mods/content/fantasy/datum/cultures.dm | 2 +- .../government/away_sites/icarus/icarus.dm | 4 +- mods/content/modern_earth/datum/religions.dm | 2 +- mods/content/pheromones/pheromone_implant.dm | 2 +- mods/content/pheromones/pheromone_mob.dm | 2 +- .../psionics/datum/antagonists/foundation.dm | 2 +- mods/content/supermatter/items/sm_grenade.dm | 2 +- .../supermatter/overrides/sm_meteor.dm | 2 +- .../adherent/organs/organs_internal.dm | 2 +- mods/species/ascent/items/tools.dm | 4 +- mods/species/vox/datum/factions_vox.dm | 2 +- nano/templates/aicard.tmpl | 40 +++++++++---------- nano/templates/camera_settings.tmpl | 4 +- nano/templates/computer_fabricator.tmpl | 2 +- nano/templates/file_browser.tmpl | 2 +- nano/templates/file_manager.tmpl | 6 +-- nano/templates/network_acl.tmpl | 2 +- nano/templates/network_lock.tmpl | 2 +- nano/templates/network_machine_settings.tmpl | 4 +- nano/templates/network_mainframe.tmpl | 6 +-- nano/templates/network_modem.tmpl | 4 +- nano/templates/network_router.tmpl | 2 +- nano/templates/request_console.tmpl | 2 +- nano/templates/song_editor.tmpl | 2 +- 206 files changed, 344 insertions(+), 345 deletions(-) diff --git a/code/__defines/MC.dm b/code/__defines/MC.dm index ddc5a1c7516f..f01b2f954289 100644 --- a/code/__defines/MC.dm +++ b/code/__defines/MC.dm @@ -24,7 +24,7 @@ if (Datum.is_processing) {\ if(Datum.is_processing != #Processor)\ {\ - PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \ + PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occurred on [#Processor]."); \ }\ } else {\ Datum.is_processing = Processor._internal_name;\ @@ -36,7 +36,7 @@ if(Datum.is_processing) {\ if(Processor.processing.Remove(Datum)) {\ Datum.is_processing = null;\ } else {\ - PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occured on [#Processor]."); \ + PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occurred on [#Processor]."); \ }\ } diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index d6591b17acf4..b7018659403b 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -155,7 +155,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define PART_CARD /obj/item/stock_parts/computer/card_slot // ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification. #define PART_PRINTER /obj/item/stock_parts/computer/nano_printer // Nano Printer component of this computer, for your everyday paperwork needs. #define PART_DRIVE /obj/item/stock_parts/computer/hard_drive/portable // Portable data storage -#define PART_AI /obj/item/stock_parts/computer/ai_slot // AI slot, an intellicard housing that allows modifications of AIs. +#define PART_AI /obj/item/stock_parts/computer/ai_slot // AI slot, an intelliCard housing that allows modifications of AIs. #define PART_TESLA /obj/item/stock_parts/computer/tesla_link // Tesla Link, Allows remote charging from nearest APC. #define PART_SCANNER /obj/item/stock_parts/computer/scanner // One of several optional scanner attachments. #define PART_D_SLOT /obj/item/stock_parts/computer/drive_slot // Portable drive slot. diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index e25429b8fe50..103e0b49b97f 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -84,7 +84,7 @@ //Run sanitize(), but remove <, >, " first to prevent displaying them as > < &34; in some places after html_encode(). //Best used for sanitize object names, window titles. -//If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entites - +//If you have a problem with sanitize() in chat, when quotes and >, < are displayed as html entities - //this is a problem of double-encode(when & becomes &), use sanitize() with encode=0, but not the sanitize_safe()! /proc/sanitize_safe(input, max_length = MAX_MESSAGE_LEN, encode = TRUE, trim = TRUE, extra = TRUE, ascii_only = FALSE) return sanitize(replace_characters(input, list(">"=" ","<"=" ", "\""="'")), max_length, encode, trim, extra, ascii_only) diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm index 674ec094cc68..19a5202daa38 100644 --- a/code/controllers/subsystems/machines.dm +++ b/code/controllers/subsystems/machines.dm @@ -7,7 +7,7 @@ if (Datum.is_processing) {\ if(Datum.is_processing != "SSmachines.[#List]")\ {\ - PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on SSmachines.[#List]."); \ + PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occurred on SSmachines.[#List]."); \ }\ } else {\ Datum.is_processing = "SSmachines.[#List]";\ diff --git a/code/datums/extensions/storage/_storage.dm b/code/datums/extensions/storage/_storage.dm index 4ff70967e1c6..07d0d0871521 100644 --- a/code/datums/extensions/storage/_storage.dm +++ b/code/datums/extensions/storage/_storage.dm @@ -380,7 +380,7 @@ var/global/list/_test_storage_items = list() /datum/storage/proc/can_view(mob/viewer) return (holder in viewer.contents) || viewer.Adjacent(holder) -///Overridable sound playback parameters. Since not all sounds are created equal. +///Overrideable sound playback parameters. Since not all sounds are created equal. /datum/storage/proc/play_open_sound(volume = 50) if(!length(open_sound) || !holder) return diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 2ee116a6b7e4..4c0f2ba93ab3 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -50,13 +50,13 @@ /datum/uplink_item/item/ammo/shotgun_shells name = "Ammobox of Shotgun Shells" - desc = "An ammobox with 2 sets of shell holders. Contains 8 buckshot shells total." + desc = "An ammo box with 2 sets of shell holders. Contains 8 buckshot shells total." item_cost = 8 path = /obj/item/box/ammo/shotgunshells /datum/uplink_item/item/ammo/shotgun_slugs name = "Ammobox of Shotgun Slugs" - desc = "An ammobox with 2 sets of shell holders. Contains 8 slugs total." + desc = "An ammo box with 2 sets of shell holders. Contains 8 slugs total." item_cost = 8 path = /obj/item/box/ammo/shotgunammo diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm index 14954c31afdb..43375e941cb9 100644 --- a/code/datums/uplink/badassery.dm +++ b/code/datums/uplink/badassery.dm @@ -11,7 +11,7 @@ /datum/uplink_item/item/badassery/balloon/random name = "For showing 'Whatevah~' (Useless Balloon)" - desc = "Randomly selects a ballon for you!" + desc = "Randomly selects a balloon for you!" path = /obj/item/toy/balloon /datum/uplink_item/item/badassery/balloon/random/get_goods(var/obj/item/uplink/U, var/loc) diff --git a/code/datums/uplink/devices_and_tools.dm b/code/datums/uplink/devices_and_tools.dm index a6628ebabefa..7536a5d65616 100644 --- a/code/datums/uplink/devices_and_tools.dm +++ b/code/datums/uplink/devices_and_tools.dm @@ -104,7 +104,7 @@ /datum/uplink_item/item/tools/flashdark name = "Flashdark" - desc = "A device similar to a flash light that absorbs the surrounding light, casting a shadowy, black mass." + desc = "A device similar to a flashlight that absorbs the surrounding light, casting a shadowy, black mass." item_cost = 32 path = /obj/item/flashlight/flashdark diff --git a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm index 097666428c62..0d08c3dd7cda 100644 --- a/code/datums/uplink/highly_visible_and_dangerous_weapons.dm +++ b/code/datums/uplink/highly_visible_and_dangerous_weapons.dm @@ -51,7 +51,7 @@ /datum/uplink_item/item/visible_weapons/energy_gun name = "Energy Gun" - desc = "A energy based sidearm with three different lethality settings." + desc = "An energy based sidearm with three different lethality settings." item_cost = 32 path = /obj/item/gun/energy/gun @@ -71,14 +71,14 @@ //These are for traitors (or other antags, perhaps) to have the option of purchasing some merc gear. /datum/uplink_item/item/visible_weapons/smg name = "Standard Submachine Gun" - desc = "A quick-firing weapon with three togglable fire modes." + desc = "A quick-firing weapon with three toggleable fire modes." item_cost = 52 path = /obj/item/gun/projectile/automatic/smg antag_roles = list(/decl/special_role/mercenary) /datum/uplink_item/item/visible_weapons/assaultrifle name = "Assault Rifle" - desc = "A common rifle with three togglable fire modes." + desc = "A common rifle with three toggleable fire modes." item_cost = 60 path = /obj/item/gun/projectile/automatic/assault_rifle antag_roles = list(/decl/special_role/mercenary) @@ -98,7 +98,7 @@ /datum/uplink_item/item/visible_weapons/combat_shotgun name = "Pump Shotgun" - desc = "A high compacity, pump-action shotgun regularly used for repelling boarding parties in close range scenarios." + desc = "A high capacity, pump-action shotgun regularly used for repelling boarding parties in close range scenarios." item_cost = 52 path = /obj/item/gun/projectile/shotgun/pump antag_roles = list(/decl/special_role/mercenary) @@ -111,7 +111,7 @@ /datum/uplink_item/item/visible_weapons/flechetterifle name = "Flechette Rifle" - desc = "A railgun with two togglable fire modes, able to launch flechette ammunition at incredible speeds." + desc = "A railgun with two toggleable fire modes, able to launch flechette ammunition at incredible speeds." item_cost = 60 path = /obj/item/gun/magnetic/railgun/flechette antag_roles = list(/decl/special_role/mercenary) diff --git a/code/datums/uplink/implants.dm b/code/datums/uplink/implants.dm index 94bdff821a27..0495c267c1b8 100644 --- a/code/datums/uplink/implants.dm +++ b/code/datums/uplink/implants.dm @@ -6,7 +6,7 @@ /datum/uplink_item/item/implants/imp_freedom name = "Freedom Implant" - desc = "An implant with an emotive trigger that can break you free of restraints. Show Security who has the real upperhand!" + desc = "An implant with an emotive trigger that can break you free of restraints. Show Security who has the real upper hand!" item_cost = 24 path = /obj/item/box/syndie_kit/imp_freedom diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm index 599c0f83f6a6..4aef274b938c 100644 --- a/code/datums/uplink/medical.dm +++ b/code/datums/uplink/medical.dm @@ -18,7 +18,7 @@ /datum/uplink_item/item/medical/stasis name = "Stasis Bag" - desc = "Reusable bag designed to slow down life functions of occupant, especially useful if short on time or in a hostile enviroment." + desc = "Reusable bag designed to slow down life functions of occupant, especially useful if short on time or in a hostile environment." item_cost = 24 path = /obj/item/bodybag/cryobag diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm index d085b9438d99..45deaffbf371 100644 --- a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm +++ b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm @@ -17,7 +17,7 @@ /datum/uplink_item/item/stealthy_weapons/concealed_cane name = "Concealed Cane Sword" - desc = "A cane used by a true gentlemen, especially ones with sharp intentions." + desc = "A cane used by a true gentleman, especially ones with sharp intentions." item_cost = 8 path = /obj/item/cane/fancy/sword diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 56b88e8f986c..ea8bcbc016f7 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -192,7 +192,7 @@ var/global/list/wireColourNames = list("darkred" = "dark red") usr.unset_machine(holder) // -// Overridable Procs +// Overrideable Procs // // Called when wires cut/mended. diff --git a/code/game/machinery/_machines_base/machinery_public_vars.dm b/code/game/machinery/_machines_base/machinery_public_vars.dm index d1288ef7817b..594aa0238e02 100644 --- a/code/game/machinery/_machines_base/machinery_public_vars.dm +++ b/code/game/machinery/_machines_base/machinery_public_vars.dm @@ -17,7 +17,7 @@ Must be implemented by subtypes. // Reads off the var value and returns it /decl/public_access/public_variable/proc/access_var(datum/owner) -// Writes to the var. Returns true if change occured, false otherwise. +// Writes to the var. Returns true if change occurred, false otherwise. // Subtypes shall call parent, and perform the actual write if the return value is true. // If the var has_updates, you must never modify the var except through this proc. /decl/public_access/public_variable/proc/write_var(datum/owner, new_value) diff --git a/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm b/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm index 15cc987b4060..82c1e1736196 100644 --- a/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm +++ b/code/game/machinery/_machines_base/stock_parts/legacy_parts.dm @@ -169,7 +169,7 @@ /obj/item/stock_parts/subspace/filter name = "hyperwave filter" icon_state = "hyperwave_filter" - desc = "A tiny device capable of filtering and converting super-intense radiowaves." + desc = "A tiny device capable of filtering and converting super-intense radio waves." origin_tech = @'{"programming":4,"magnets":2}' material = /decl/material/solid/metal/steel matter = list(/decl/material/solid/metal/silver = MATTER_AMOUNT_REINFORCEMENT) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 1028e2d4098e..11d4e5c9b63b 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -667,7 +667,7 @@ var/device_id = href_list["id_tag"] switch(href_list["command"]) if("set_external_pressure") - var/input_pressure = input(user, "What pressure you like the system to mantain?", "Pressure Controls") as num|null + var/input_pressure = input(user, "What pressure you like the system to maintain?", "Pressure Controls") as num|null if(isnum(input_pressure) && CanUseTopic(user, state)) send_signal(device_id, list(href_list["command"] = input_pressure)) return TOPIC_REFRESH diff --git a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm index dabbb7680fbb..66aa8d5c057c 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers_dummy.dm @@ -1,7 +1,7 @@ ///Provides remote access to a controller (since they must be unique). /obj/machinery/dummy_airlock_controller name = "remote airlock control terminal" - desc = "A secondary airlock control terminal meant to be subordinated to a master airlock control terminal to allow remotely controlling the later from the former." + desc = "A secondary airlock control terminal meant to be subordinated to a master airlock control terminal to allow remotely controlling the latter from the former." icon = 'icons/obj/airlock_machines.dmi' icon_state = "airlock_control_off" layer = ABOVE_OBJ_LAYER diff --git a/code/game/machinery/mech_recharger.dm b/code/game/machinery/mech_recharger.dm index bd9e8be69364..5c2449e37ed2 100644 --- a/code/game/machinery/mech_recharger.dm +++ b/code/game/machinery/mech_recharger.dm @@ -1,6 +1,6 @@ /obj/machinery/mech_recharger name = "exosuit dock" - desc = "A exosuit recharger, built into the floor." + desc = "An exosuit recharger, built into the floor." icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_floor" density = FALSE diff --git a/code/game/machinery/self_destruct_storage.dm b/code/game/machinery/self_destruct_storage.dm index d8cd3e9d3a08..afaf920ef1da 100644 --- a/code/game/machinery/self_destruct_storage.dm +++ b/code/game/machinery/self_destruct_storage.dm @@ -1,6 +1,6 @@ /obj/machinery/nuclear_cylinder_storage name = "nuclear cylinder storage" - desc = "It's a secure, armored storage unit embeded into the floor for storing the nuclear cylinders." + desc = "It's a secure, armored storage unit embedded into the floor for storing the nuclear cylinders." icon = 'icons/obj/machines/self_destruct_storage.dmi' icon_state = "base" anchored = TRUE diff --git a/code/game/machinery/vending/food.dm b/code/game/machinery/vending/food.dm index 8abc07f5536a..2a4fb62f3352 100644 --- a/code/game/machinery/vending/food.dm +++ b/code/game/machinery/vending/food.dm @@ -198,7 +198,7 @@ /obj/machinery/vending/cola name = "Robust Softdrinks" - desc = "A softdrink vendor provided by Robust Industries, LLC." + desc = "A soft drinks vendor provided by Robust Industries, LLC." icon = 'icons/obj/machines/vending/drinks.dmi' vend_delay = 11 base_type = /obj/machinery/vending/cola diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index bf5c37416308..6f573835da35 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -9,7 +9,7 @@ /obj/machinery/washing_machine name = "washing machine" - desc = "A commerical washing machine used to wash clothing items and linens. It requires detergent for efficient washing." + desc = "A commercial washing machine used to wash clothing items and linens. It requires detergent for efficient washing." icon = 'icons/obj/machines/washing_machine.dmi' icon_state = "wm_00" density = TRUE diff --git a/code/game/objects/items/blackout.dm b/code/game/objects/items/blackout.dm index d0528dc93ec0..4bc3d51b6f41 100644 --- a/code/game/objects/items/blackout.dm +++ b/code/game/objects/items/blackout.dm @@ -9,7 +9,7 @@ /obj/item/blackout name = "blackout pulser" - desc = "A complicated eletronic device of unknown purpose" + desc = "A complicated electronic device of unknown purpose." icon = 'icons/obj/items/blackout.dmi' icon_state = "device_blackout-off" max_health = ITEM_HEALTH_NO_DAMAGE diff --git a/code/game/objects/items/cryobag.dm b/code/game/objects/items/cryobag.dm index b9dd96121a5c..b5d5f68a3e08 100644 --- a/code/game/objects/items/cryobag.dm +++ b/code/game/objects/items/cryobag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag/cryobag name = "stasis bag" desc = "A folded, reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/cryobag.dmi' icon_state = "bodybag_folded" origin_tech = @'{"biotech":4}' @@ -25,7 +25,7 @@ /obj/structure/closet/body_bag/cryobag name = "stasis bag" desc = "A reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/cryobag.dmi' item_path = /obj/item/bodybag/cryobag material = /decl/material/solid/organic/plastic diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index ffd39d55806b..9516a2a65a52 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -1,5 +1,5 @@ /obj/item/aicard - name = "inteliCard" + name = "intelliCard" icon = 'icons/obj/items/device/ai_card.dmi' icon_state = ICON_STATE_WORLD w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/devices/boombox.dm b/code/game/objects/items/devices/boombox.dm index aef407430fd1..1b9c5ecbc428 100644 --- a/code/game/objects/items/devices/boombox.dm +++ b/code/game/objects/items/devices/boombox.dm @@ -1,6 +1,6 @@ /obj/item/boombox name = "boombox" - desc = "A device used to emit rhythmic sounds, colloquialy refered to as a 'boombox'. It's in a retro style (massive), and absolutely unwieldy." + desc = "A device used to emit rhythmic sounds, colloquially referred to as a 'boombox'. It's in a retro style (massive), and absolutely unwieldy." icon = 'icons/obj/items/device/boombox.dmi' icon_state = "off" item_state = "boombox" diff --git a/code/game/objects/items/devices/personal_shield.dm b/code/game/objects/items/devices/personal_shield.dm index 95be1abc4669..c83b7522cc8d 100644 --- a/code/game/objects/items/devices/personal_shield.dm +++ b/code/game/objects/items/devices/personal_shield.dm @@ -1,6 +1,6 @@ /obj/item/personal_shield name = "personal shield" - desc = "Truely a life-saver: this device protects its user from being hit by objects moving very, very fast, though only for a few shots." + desc = "Truly a lifesaver: this device protects its user from being hit by objects moving very, very fast, though only for a few shots." icon = 'icons/obj/items/weapon/batterer.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/organic/plastic diff --git a/code/game/objects/items/devices/radio/headsets_shared.dm b/code/game/objects/items/devices/radio/headsets_shared.dm index 6c5551ea9839..ead756343e37 100644 --- a/code/game/objects/items/devices/radio/headsets_shared.dm +++ b/code/game/objects/items/devices/radio/headsets_shared.dm @@ -52,7 +52,7 @@ /obj/item/radio/headset/headset_sci name = "science radio headset" - desc = "A sciency headset. Like usual." + desc = "A science-y headset. Like usual." icon = 'icons/obj/items/device/radio/headsets/headset_science.dmi' encryption_keys = list(/obj/item/encryptionkey/sci) @@ -63,7 +63,7 @@ /obj/item/radio/headset/headset_eng name = "engineering radio headset" - desc = "When the engineers wish to gossip like highschoolers." + desc = "When the engineers wish to gossip like high-schoolers." icon = 'icons/obj/items/device/radio/headsets/headset_engineering.dmi' encryption_keys = list(/obj/item/encryptionkey/eng) diff --git a/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm b/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm index 6869f3eedd1d..50a734b487f1 100644 --- a/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm +++ b/code/game/objects/items/flame/flame_fuelled_lighter_zippo.dm @@ -1,6 +1,6 @@ /obj/item/flame/fuelled/lighter/zippo name = "zippo lighter" - desc = "It's a zippo-styled lighter, using a replacable flint in a fetching steel case. It makes a clicking sound that everyone loves." + desc = "It's a zippo-styled lighter, using a replaceable flint in a fetching steel case. It makes a clicking sound that everyone loves." icon = 'icons/obj/items/flame/zippo.dmi' max_fuel = 10 material = /decl/material/solid/metal/stainlesssteel diff --git a/code/game/objects/items/flashlights/floodlamp.dm b/code/game/objects/items/flashlights/floodlamp.dm index 3c8eb02b88ad..c98063000b84 100644 --- a/code/game/objects/items/flashlights/floodlamp.dm +++ b/code/game/objects/items/flashlights/floodlamp.dm @@ -1,7 +1,7 @@ //hand portable floodlights for emergencies. Less bulky than the large ones. But also less light. Unused green variant in the sheet. /obj/item/flashlight/lamp/floodlamp name = "flood lamp" - desc = "A portable emergency flood light with a ultra-bright LED." + desc = "A portable emergency floodlight with a ultra-bright LED." icon = 'icons/obj/lighting/floodlamp.dmi' on = 0 w_class = ITEM_SIZE_LARGE diff --git a/code/game/objects/items/flashlights/lavalamp.dm b/code/game/objects/items/flashlights/lavalamp.dm index 92f434c88526..e5d123aa20a9 100644 --- a/code/game/objects/items/flashlights/lavalamp.dm +++ b/code/game/objects/items/flashlights/lavalamp.dm @@ -1,7 +1,7 @@ //Lava Lamps: Because we're already stuck in the 70ies with those fax machines. /obj/item/flashlight/lamp/lava name = "lava lamp" - desc = "A kitchy throwback decorative light. Noir Edition." + desc = "A kitschy throwback decorative light. Noir Edition." icon = 'icons/obj/lighting/lavalamp.dmi' icon_state = "lavalamp" on = 0 @@ -22,32 +22,32 @@ add_overlay(I) /obj/item/flashlight/lamp/lava/red - desc = "A kitchy red decorative light." + desc = "A kitschy red decorative light." light_color = COLOR_RED /obj/item/flashlight/lamp/lava/blue - desc = "A kitchy blue decorative light" + desc = "A kitschy blue decorative light" light_color = COLOR_BLUE /obj/item/flashlight/lamp/lava/cyan - desc = "A kitchy cyan decorative light" + desc = "A kitschy cyan decorative light" light_color = COLOR_CYAN /obj/item/flashlight/lamp/lava/green - desc = "A kitchy green decorative light" + desc = "A kitschy green decorative light" light_color = COLOR_GREEN /obj/item/flashlight/lamp/lava/orange - desc = "A kitchy orange decorative light" + desc = "A kitschy orange decorative light" light_color = COLOR_ORANGE /obj/item/flashlight/lamp/lava/purple - desc = "A kitchy purple decorative light" + desc = "A kitschy purple decorative light" light_color = COLOR_PURPLE /obj/item/flashlight/lamp/lava/pink - desc = "A kitchy pink decorative light" + desc = "A kitschy pink decorative light" light_color = COLOR_PINK /obj/item/flashlight/lamp/lava/yellow - desc = "A kitchy yellow decorative light" + desc = "A kitschy yellow decorative light" light_color = COLOR_YELLOW diff --git a/code/game/objects/items/lockpicks.dm b/code/game/objects/items/lockpicks.dm index cc799780b688..99c3eccabbec 100644 --- a/code/game/objects/items/lockpicks.dm +++ b/code/game/objects/items/lockpicks.dm @@ -35,7 +35,7 @@ /obj/item/lockpick_roll name = "roll of lockpicks" - desc = "A stitched roll used to store thin, strangely-shaped tools commonly used used to pick locks." + desc = "A stitched roll used to store thin, strangely-shaped tools commonly used to pick locks." icon = 'icons/obj/items/lockpick_roll.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/organic/leather diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 576c58a9dc61..fc70e8902a54 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -71,12 +71,12 @@ // Mechs are handled in their attackby (mech_interaction.dm). /obj/item/kit/paint name = "exosuit decal kit" - desc = "A kit containing all the needed tools and parts to repaint a exosuit." + desc = "A kit containing all the needed tools and parts to repaint an exosuit." abstract_type = /obj/item/kit/paint /obj/item/kit/paint/examine(mob/user) . = ..() - to_chat(user, "This kit will add a '[new_name]' decal to a exosuit'.") + to_chat(user, "This kit will add a '[new_name]' decal to an exosuit'.") // exosuit kits. /obj/item/kit/paint/flames_red diff --git a/code/game/objects/items/rescuebag.dm b/code/game/objects/items/rescuebag.dm index da10d3c85002..6e69603618ea 100644 --- a/code/game/objects/items/rescuebag.dm +++ b/code/game/objects/items/rescuebag.dm @@ -2,7 +2,7 @@ /obj/item/bodybag/rescue name = "rescue bag" desc = "A folded, reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/rescuebag.dmi' icon_state = "folded" origin_tech = @'{"biotech":2}' @@ -60,7 +60,7 @@ /obj/structure/closet/body_bag/rescue name = "rescue bag" desc = "A reusable plastic bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ - a hostile enviroment." + a hostile environment." icon = 'icons/obj/closets/rescuebag.dmi' item_path = /obj/item/bodybag/rescue storage_types = CLOSET_STORAGE_MOBS diff --git a/code/game/objects/items/stacks/medical/medical_resin.dm b/code/game/objects/items/stacks/medical/medical_resin.dm index 78d0ef6eea82..c7ab7c5f060c 100644 --- a/code/game/objects/items/stacks/medical/medical_resin.dm +++ b/code/game/objects/items/stacks/medical/medical_resin.dm @@ -1,7 +1,7 @@ /obj/item/stack/medical/resin name = "resin patches" singular_name = "resin patch" - desc = "A resin-based patching kit used to repair crystalline bodyparts. The label is written in a colourful, angular, unreadable script." + desc = "A resin-based patching kit used to repair crystalline body parts. The label is written in a colourful, angular, unreadable script." icon_state = "resin-pack" heal_brute = 10 heal_burn = 10 @@ -12,7 +12,7 @@ /obj/item/stack/medical/resin/crafted name = "resin globules" - desc = "A lump of slick, shiny resin. Used to repair damage to crystalline bodyparts." + desc = "A lump of slick, shiny resin. Used to repair damage to crystalline body parts." singular_name = "resin globule" icon_state = "resin-lump" heal_brute = 5 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 02e51277a757..028e5a4a01a1 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -10,7 +10,7 @@ /obj/item/stack/tile name = "tile" singular_name = "tile" - desc = "A non-descript floor tile." + desc = "A nondescript floor tile." randpixel = 7 w_class = ITEM_SIZE_NORMAL max_amount = 100 @@ -319,7 +319,7 @@ /obj/item/stack/tile/roof name = "roofing tile" singular_name = "roofing tile" - desc = "A non-descript roofing tile." + desc = "A nondescript roofing tile." matter_multiplier = 0.3 icon_state = "tile" material = /decl/material/solid/metal/steel diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 53ec5ef987f7..6a100e476002 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -388,12 +388,12 @@ /obj/item/toy/figure/geneticist name = "Geneticist action figure" - desc = "A \"Space Life\" brand Geneticist action figure, which was recently dicontinued." + desc = "A \"Space Life\" brand Geneticist action figure, which was recently discontinued." icon_state = "geneticist" /obj/item/toy/figure/hop - name = "Head of Personel action figure" - desc = "A \"Space Life\" brand Head of Personel action figure." + name = "Head of Personnel action figure" + desc = "A \"Space Life\" brand Head of Personnel action figure." icon_state = "hop" /obj/item/toy/figure/hos @@ -576,9 +576,7 @@ //Office Desk Toys /obj/item/toy/desk - name = "desk toy master" - desc = "A object that does not exist. Parent Item" - + abstract_type = /obj/item/toy/desk var/on = 0 var/activation_sound = 'sound/effects/flashlight.ogg' @@ -598,7 +596,7 @@ /obj/item/toy/desk/newtoncradle name = "\improper Newton's cradle" - desc = "A ancient 21th century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space." + desc = "An ancient 21st century super-weapon model demonstrating that Sir Isaac Newton is the deadliest sonuvabitch in space." icon_state = "newtoncradle" /obj/item/toy/desk/fan @@ -613,7 +611,7 @@ /obj/item/toy/desk/dippingbird name = "dipping bird toy" - desc = "A ancient human bird idol, worshipped by clerks and desk jockeys." + desc = "An ancient human bird idol, worshipped by clerks and desk jockeys." icon_state= "dippybird" // tg station ports diff --git a/code/game/objects/items/waterskin.dm b/code/game/objects/items/waterskin.dm index 73852feaef06..a9b1b3261a62 100644 --- a/code/game/objects/items/waterskin.dm +++ b/code/game/objects/items/waterskin.dm @@ -44,7 +44,7 @@ add_overlay(stopper_overlay) /obj/item/chems/glass/waterskin/crafted - desc = "A long and rather unwieldly water-carrying vessel." + desc = "A long and rather unwieldy water-carrying vessel." icon = 'icons/obj/items/waterskin_crafted.dmi' material = /decl/material/solid/organic/leather color = /decl/material/solid/organic/leather::color diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index f367fe6ebb2a..e8e041f23016 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -75,7 +75,7 @@ icon_state = "data_2" /obj/item/card/data/disk - desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicibly looks like a floppy disk." + desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicably looks like a floppy disk." icon_state = "data_3" /obj/item/card/data/get_assembly_detail_color() diff --git a/code/game/objects/items/weapons/circuitboards/wall.dm b/code/game/objects/items/weapons/circuitboards/wall.dm index 6aab1dd838e4..fe150c173d20 100644 --- a/code/game/objects/items/weapons/circuitboards/wall.dm +++ b/code/game/objects/items/weapons/circuitboards/wall.dm @@ -4,7 +4,7 @@ name = "circuitboard (fire alarm)" icon = 'icons/obj/doors/door_assembly.dmi' icon_state = "door_electronics" - desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees celsius!\"." + desc = "A circuit. It has a label on it, it says \"Can handle heat levels up to 40 degrees Celsius!\"." build_path = /obj/machinery/firealarm board_type = "wall" origin_tech = @'{"programming":1,"engineering":1}' diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index cdaab55ecaa5..5b9e2a62d934 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -465,7 +465,7 @@ /obj/item/shockpaddles/robot name = "defibrillator paddles" - desc = "A pair of advanced shockpaddles powered by a robot's internal power cell, able to penetrate thick clothing." + desc = "A pair of advanced shock paddles powered by a robot's internal power cell, able to penetrate thick clothing." chargecost = 50 combat = 1 cooldowntime = (3 SECONDS) @@ -542,7 +542,7 @@ */ /obj/item/shockpaddles/standalone - desc = "A pair of shockpaddles powered by an experimental miniaturized reactor" //Inspired by the advanced e-gun + desc = "A pair of shock paddles powered by an experimental miniaturized reactor" //Inspired by the advanced e-gun var/fail_counter = 0 /obj/item/shockpaddles/standalone/Destroy() diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index db8e711d5628..f67a1791c48d 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,6 +1,6 @@ /obj/item/dice name = "d6" - desc = "A dice with six sides." + desc = "A die with six sides." icon = 'icons/obj/dice.dmi' icon_state = "d66" w_class = ITEM_SIZE_TINY @@ -37,31 +37,31 @@ /obj/item/dice/d4 name = "d4" - desc = "A dice with four sides." + desc = "A die with four sides." icon_state = "d44" sides = 4 /obj/item/dice/d8 name = "d8" - desc = "A dice with eight sides." + desc = "A die with eight sides." icon_state = "d88" sides = 8 /obj/item/dice/d10 name = "d10" - desc = "A dice with ten sides." + desc = "A die with ten sides." icon_state = "d1010" sides = 10 /obj/item/dice/d12 name = "d12" - desc = "A dice with twelve sides." + desc = "A die with twelve sides." icon_state = "d1212" sides = 12 /obj/item/dice/d20 name = "d20" - desc = "A dice with twenty sides." + desc = "A die with twenty sides." icon_state = "d2020" sides = 20 @@ -76,7 +76,7 @@ /obj/item/dice/d100 name = "d100" - desc = "A dice with ten sides. This one is for the tens digit." + desc = "A die with ten sides. This one is for the tens digit." icon_state = "d10010" sides = 10 diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index 0a55a70a9509..11fa6ec87de2 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -64,7 +64,7 @@ /obj/item/clothing/mask/smokable/ecig/deluxe name = "deluxe electronic cigarette" - desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar." + desc = "A premium model eHavana MK3 electronic cigarette, shaped like a cigar." icon = 'icons/clothing/mask/smokables/cigarette_electronic_deluxe.dmi' /obj/item/clothing/mask/smokable/ecig/deluxe/setup_power_supply(loaded_cell_type, accepted_cell_type, power_supply_extension_type, charge_value) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 69ac907bcac4..138a3b7df34c 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -91,7 +91,7 @@ detonate() /obj/item/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve - desc = "Use of this weapon may constiute a war crime in your area, consult your local captain." + desc = "Use of this weapon may constitute a war crime in your area, consult your local captain." name = "clusterbang" icon = 'icons/obj/items/grenades/clusterbang.dmi' diff --git a/code/game/objects/items/weapons/material/coins.dm b/code/game/objects/items/weapons/material/coins.dm index 19198cdc5bde..1cdd0270a96d 100644 --- a/code/game/objects/items/weapons/material/coins.dm +++ b/code/game/objects/items/weapons/material/coins.dm @@ -16,7 +16,7 @@ . = ..() icon_state = "coin[rand(1,10)]" if(material) - desc = "A old-style coin stamped out of [material.solid_name]." + desc = "An old-style coin stamped out of [material.solid_name]." set_extension(src, /datum/extension/tool, list(TOOL_SCREWDRIVER = TOOL_QUALITY_BAD)) // "Coin Flipping, A.wav" by InspectorJ (www.jshaw.co.uk) of Freesound.org diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 9df9b46dc099..6a227fb7f93d 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -119,7 +119,7 @@ //Utility knives /obj/item/knife/utility name = "utility knife" - desc = "An utility knife with a polymer handle, commonly used through human space." + desc = "A utility knife with a polymer handle, commonly used through human space." icon = 'icons/obj/items/weapon/knives/utility.dmi' w_class = ITEM_SIZE_SMALL draw_handle = TRUE diff --git a/code/game/objects/items/weapons/material/swiss.dm b/code/game/objects/items/weapons/material/swiss.dm index 44f237dc8534..69d051a3aa9f 100644 --- a/code/game/objects/items/weapons/material/swiss.dm +++ b/code/game/objects/items/weapons/material/swiss.dm @@ -150,7 +150,7 @@ /obj/item/knife/folding/swiss/explorer name = "explorer's combi-knife" - desc = "A small, purple, multi-purpose folding knife. This one adds a wood saw and pry bar." + desc = "A small, purple, multi-purpose folding knife. This one adds a wood saw and prybar." handle_color = COLOR_PURPLE tools = list(SWISSKNF_LBLADE, SWISSKNF_SBLADE, SWISSKNF_CLIFTER, SWISSKNF_COPENER, SWISSKNF_WBLADE, SWISSKNF_CROWBAR) diff --git a/code/game/objects/items/weapons/storage/basket.dm b/code/game/objects/items/weapons/storage/basket.dm index 8c7661451a91..b16df16f5755 100644 --- a/code/game/objects/items/weapons/storage/basket.dm +++ b/code/game/objects/items/weapons/storage/basket.dm @@ -22,4 +22,4 @@ icon = 'icons/obj/items/storage/baskets/basket_large.dmi' w_class = ITEM_SIZE_GARGANTUAN storage = /datum/storage/basket/large - slowdown_general = 1 // Large and unwieldly + slowdown_general = 1 // Large and unwieldy diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 639d83a17547..7e8de5593b24 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -284,7 +284,7 @@ /obj/item/box/trackimp name = "boxed tracking implant kit" - desc = "Box full of scum-bag tracking utensils." + desc = "Box full of scumbag-tracking utensils." icon_state = "implant" /obj/item/box/trackimp/WillContain() return list(/obj/item/implantcase/tracking = 4, @@ -567,7 +567,7 @@ /obj/item/box/armband/engine name = "box of spare engineering armbands" - desc = "A box full of engineering armbands. For use in emergencies when provisional engineering peronnel are needed." + desc = "A box full of engineering armbands. For use in emergencies when provisional engineering personnel are needed." /obj/item/box/armband/engine/WillContain() return list(/obj/item/clothing/armband/engine = 5) @@ -717,7 +717,7 @@ /obj/item/box/parts_pack name = "parts pack" - desc = "A densely-stuffed box containing some small eletrical parts." + desc = "A densely-stuffed box containing some small electrical parts." icon = 'icons/obj/items/storage/part_pack.dmi' icon_state = "part" w_class = ITEM_SIZE_SMALL diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index 1a0d7dd5c71f..921f48977969 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/code/game/objects/items/weapons/storage/misc.dm @@ -93,7 +93,7 @@ /obj/item/chewables/rollable/fine name = "bag of Golden Sol tobacco" - desc = "A exclusive brand of overpriced tobacco, allegedly grown at a lagrange point station in Sol system." + desc = "An exclusive brand of overpriced tobacco, allegedly grown at a lagrange point station in Sol system." icon_state = "rollfine" /obj/item/chewables/rollable/fine/WillContain() @@ -132,7 +132,7 @@ /obj/item/chewables/candy/cookies name = "pack of Getmore Cookies" - desc = "A pack of delicious cookies, and possibly the only product in Getmores Chocolate Corp lineup that has any trace of chocolate in it." + desc = "A pack of delicious cookies, and possibly the only product in Getmore Chocolate Corp's lineup that has any trace of chocolate in it." icon_state = "cookiebag" storage = /datum/storage/chewables/cookies diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 44fa64eac6f0..d0bbb3899cd0 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -110,8 +110,8 @@ starting_pressure = list(/decl/material/gas/carbon_dioxide = 6 ATM) /obj/item/tank/jetpack/rig - name = "integrated manuvering module thrusterpack" - desc = "The 'manuvering' part of a manuvering jet module for a hardsuit. You could... probably use this standalone?" + name = "integrated maneuvering module thrusterpack" + desc = "The 'maneuvering' part of a maneuvering jet module for a hardsuit. You could... probably use this standalone?" starting_pressure = list(/decl/material/gas/oxygen = 6 ATM) var/obj/item/rig/holder diff --git a/code/game/objects/random/subtypes/tech.dm b/code/game/objects/random/subtypes/tech.dm index 26c057122136..23c298283fae 100644 --- a/code/game/objects/random/subtypes/tech.dm +++ b/code/game/objects/random/subtypes/tech.dm @@ -15,8 +15,8 @@ return spawnable_choices /obj/random/powercell - name = "random powercell" - desc = "This is a random powercell." + name = "random power cell" + desc = "This is a random power cell." icon = 'icons/obj/power.dmi' icon_state = "hcell" diff --git a/code/game/objects/random/subtypes/tools.dm b/code/game/objects/random/subtypes/tools.dm index 0e4c773171fa..ed0a73164cb1 100644 --- a/code/game/objects/random/subtypes/tools.dm +++ b/code/game/objects/random/subtypes/tools.dm @@ -17,8 +17,8 @@ return spawnable_choices /obj/random/tool/power - name = "random powertool" - desc = "This is a random rare powertool for maintenance" + name = "random power tool" + desc = "This is a random rare power tool for maintenance" /obj/random/tool/power/spawn_choices() var/static/list/spawnable_choices = list( diff --git a/code/game/objects/structures/chemistry/_chemistry.dm b/code/game/objects/structures/chemistry/_chemistry.dm index 338fdd8a24bc..7050d2f9ee86 100644 --- a/code/game/objects/structures/chemistry/_chemistry.dm +++ b/code/game/objects/structures/chemistry/_chemistry.dm @@ -1,6 +1,6 @@ /obj/structure/fire_source/heater name = "heater" - desc = "An small, squat burner, generally used for heating reagents." + desc = "A small, squat burner, generally used for heating reagents." icon = 'icons/obj/structures/alembic.dmi' icon_state = ICON_STATE_WORLD material = /decl/material/solid/stone/pottery diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index ba9e023a08e3..629490936d77 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -35,7 +35,7 @@ */ /obj/structure/closet/chefcloset name = "chef's closet" - desc = "It's a storage unit for foodservice garments." + desc = "It's a storage unit for food service garments." closet_appearance = /decl/closet_appearance/wardrobe/black /obj/structure/closet/chefcloset/WillContain() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index d3aa1f21c39c..9182d57f4e69 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -90,7 +90,7 @@ /obj/structure/closet/crate/internals name = "internals crate" - desc = "A internals crate." + desc = "An internals crate." /obj/structure/closet/crate/internals/fuel name = "\improper Fuel tank crate" @@ -179,7 +179,7 @@ /obj/structure/closet/crate/radiation name = "radioactive crate" - desc = "A leadlined crate with a radiation sign on it." + desc = "A lead-lined crate with a radiation sign on it." closet_appearance = /decl/closet_appearance/crate/radiation /obj/structure/closet/crate/radiation_gear @@ -197,7 +197,7 @@ /obj/structure/closet/crate/secure/explosives name = "explosives crate" - desc = "A secure exploxives crate." + desc = "A secure explosives crate." closet_appearance = /decl/closet_appearance/crate/secure/hazard /obj/structure/closet/crate/secure/shuttle diff --git a/code/game/objects/structures/crematorium.dm b/code/game/objects/structures/crematorium.dm index 61b227552247..bb05961a107a 100644 --- a/code/game/objects/structures/crematorium.dm +++ b/code/game/objects/structures/crematorium.dm @@ -1,6 +1,6 @@ /obj/structure/crematorium name = "crematorium" - desc = "A human incinerator. Works well on barbeque nights." + desc = "A human incinerator. Works well on barbecue nights." icon = 'icons/obj/structures/crematorium.dmi' icon_state = "crematorium_closed" density = TRUE diff --git a/code/game/objects/structures/signs/department_signs.dm b/code/game/objects/structures/signs/department_signs.dm index 9493d2d622f8..92fa661be71e 100644 --- a/code/game/objects/structures/signs/department_signs.dm +++ b/code/game/objects/structures/signs/department_signs.dm @@ -23,24 +23,24 @@ /obj/structure/sign/department/xenobio_1 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon_state = "xenobio" /obj/structure/sign/department/xenobio_2 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio2" /obj/structure/sign/department/xenobio_3 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio3" /obj/structure/sign/department/xenobio_4 name = "\improper XENOBIOLOGY" - desc = "A sign labelling an area as a place where xenobiological entites are researched." + desc = "A sign labelling an area as a place where xenobiological entities are researched." icon = 'icons/obj/signs/location_signs.dmi' icon_state = "xenobio4" @@ -176,6 +176,6 @@ /obj/structure/sign/department/star_of_life name = "emergency" - desc = "The blue six pointed star with a rod of Asclepius is the intergalactic symbol of emergency medical services." + desc = "The blue six-pointed star with a rod of Asclepius is the intergalactic symbol of emergency medical services." icon = 'icons/obj/signs/medical.dmi' icon_state = "staroflife" \ No newline at end of file diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 549d7d913abd..a7fe8eb9ec9f 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -497,7 +497,7 @@ var/global/list/hygiene_props = list() /decl/barricade_tape_template/toilet tape_kind = "toilet paper" tape_desc = "A length of toilet paper. Seems like custodia is marking their territory again." - roll_desc = "A unbranded roll of standard issue two ply toilet paper. Refined from carefully rendered down sea shells due to the government's 'Abuse Of The Trees Act'." + roll_desc = "An unbranded roll of standard issue two ply toilet paper. Refined from carefully rendered down sea shells due to the government's 'Abuse Of The Trees Act'." base_icon_state = "stripetape" tape_color = COLOR_WHITE detail_overlay = "stripes" diff --git a/code/modules/ZAS/Fire.dm b/code/modules/ZAS/Fire.dm index 10ecd938f694..b4b955ecf4e1 100644 --- a/code/modules/ZAS/Fire.dm +++ b/code/modules/ZAS/Fire.dm @@ -352,7 +352,7 @@ If it gains pressure too slowly, it may leak or just rupture instead of explodin legs_exposure = 0 if(C.body_parts_covered & SLOT_ARMS) arms_exposure = 0 - //minimize this for low-pressure enviroments + //minimize this for low-pressure environments var/mx = 5 * firelevel/vsc.fire_firelevel_multiplier * min(pressure / ONE_ATMOSPHERE, 1) //Always check these damage procs first if fire damage isn't working. They're probably what's wrong. diff --git a/code/modules/admin/quantum_mechanic.dm b/code/modules/admin/quantum_mechanic.dm index 28cf80af10ed..d9977490a913 100644 --- a/code/modules/admin/quantum_mechanic.dm +++ b/code/modules/admin/quantum_mechanic.dm @@ -274,7 +274,7 @@ // ID /obj/item/card/id/quantum - desc = "An ID straight from the Department of Spaciotemporal Affairs. This one looks highly classified." + desc = "An ID straight from the Department of Spatiotemporal Affairs. This one looks highly classified." /obj/item/card/id/quantum/Initialize() . = ..() diff --git a/code/modules/admin/verbs/SDQL_2/SDQL_2.dm b/code/modules/admin/verbs/SDQL_2/SDQL_2.dm index 0331cb89a492..71b7f7208c8a 100644 --- a/code/modules/admin/verbs/SDQL_2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL_2/SDQL_2.dm @@ -149,7 +149,7 @@ to_chat(usr, "Query executed on [objs.len] object\s.") catch(var/exception/e) - to_chat(usr, "An exception has occured during the execution of your query and your query has been aborted.") + to_chat(usr, "An exception has occurred during the execution of your query and your query has been aborted.") to_chat(usr, EXCEPTION_TEXT(e)) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c23689af34ca..017f1c2bb561 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -195,7 +195,7 @@ M.visible_message(result[1], result[1], narrate = TRUE) log_and_message_admins(" - VisibleNarrate [result[2]]/[result[3]] on [A]: [result[4]]") -// Visible narrate, it's as if it's a audible message +// Visible narrate, it's as if it's an audible message /client/proc/cmd_admin_audible_narrate(var/atom/A) set category = "Special Verbs" set name = "Audible Narrate" diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index d8bcb207a121..f759887ff62d 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -1,6 +1,6 @@ /obj/item/assembly/mousetrap name = "rat trap" - desc = "A handy little spring-loaded trap for catching pesty rodents." + desc = "A handy little spring-loaded trap for catching pesky pests." icon_state = "mousetrap" origin_tech = @'{"combat":1}' material = /decl/material/solid/organic/wood/oak diff --git a/code/modules/atmospherics/components/binary_devices/pipeturbine.dm b/code/modules/atmospherics/components/binary_devices/pipeturbine.dm index e72a09e8d18e..510fe486f1e5 100644 --- a/code/modules/atmospherics/components/binary_devices/pipeturbine.dm +++ b/code/modules/atmospherics/components/binary_devices/pipeturbine.dm @@ -75,7 +75,7 @@ /obj/machinery/turbinemotor name = "motor" - desc = "Electrogenerator. Converts rotation into power." + desc = "A turbine motor. Converts rotation into power." icon = 'icons/obj/pipeturbine.dmi' icon_state = "motor" anchored = FALSE diff --git a/code/modules/augment/active/tool/engineering.dm b/code/modules/augment/active/tool/engineering.dm index b46692f220d6..20fec8cfe1a6 100644 --- a/code/modules/augment/active/tool/engineering.dm +++ b/code/modules/augment/active/tool/engineering.dm @@ -33,7 +33,7 @@ /obj/item/screwdriver/finger name = "digital screwdriver" - desc = "A nifty powertool at your literal fingertips." + desc = "A nifty power tool at your literal fingertips." icon_state = "screwdriver_finger" icon = 'icons/obj/augment_tools.dmi' @@ -43,7 +43,7 @@ /obj/item/crowbar/finger name = "digital prybar" - desc = "A somewhat awkward to use prybar. It doubles as bottle opener." + desc = "A somewhat awkward to use prybar. It doubles as a bottle opener." icon_state = "prybar_finger" icon = 'icons/obj/augment_tools.dmi' diff --git a/code/modules/augment/passive/boost/muscle.dm b/code/modules/augment/passive/boost/muscle.dm index ca38a5cd2ffe..913214d9619a 100644 --- a/code/modules/augment/passive/boost/muscle.dm +++ b/code/modules/augment/passive/boost/muscle.dm @@ -7,7 +7,7 @@ name = "mechanical muscles" allowed_organs = list(BP_AUGMENT_R_LEG, BP_AUGMENT_L_LEG) icon_state = "muscule" - desc = "Nanofiber tendons powered by an array of actuators to help the wearer mantain speed even while encumbered. You may want to install these in pairs to see a result." + desc = "Nanofiber tendons powered by an array of actuators to help the wearer maintain speed even while encumbered. You may want to install these in pairs to see a result." material = /decl/material/solid/metal/steel origin_tech = @'{"materials":4,"magnets":3,"biotech":3}' var/obj/item/organ/internal/augment/boost/muscle/other //we need two for these diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm index c97ef5ee9035..49dbb1237f44 100644 --- a/code/modules/awaymissions/pamphlet.dm +++ b/code/modules/awaymissions/pamphlet.dm @@ -8,7 +8,7 @@ winning dental plan- but that's not all the Gateway project has to offer.
\
Because we care about you, we feel it is only fair to make sure you know the risks \ before you commit to joining the Gateway project. All away destinations have \ - been fully scanned by a expeditionary team, and are certified to be 100% safe. \ + been fully scanned by an expeditionary team, and are certified to be 100% safe. \ We've even left a case of space beer along with the basic materials you'll need to expand \ the Project's operational area and start your new life.

\ Gateway Operation Basics
\ diff --git a/code/modules/bodytype/bodytype_quadruped.dm b/code/modules/bodytype/bodytype_quadruped.dm index ab5bbdd75e6f..359a7d0d28a9 100644 --- a/code/modules/bodytype/bodytype_quadruped.dm +++ b/code/modules/bodytype/bodytype_quadruped.dm @@ -16,12 +16,12 @@ BP_L_FOOT = list("path" = /obj/item/organ/external/foot/quadruped), BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/quadruped) ) - var/ridable = TRUE + var/rideable = TRUE var/riding_offset = @"{'x':0,'y':0,'z':8}" /decl/bodytype/quadruped/apply_appearance(var/mob/living/human/H) . = ..() - H.can_buckle = ridable + H.can_buckle = rideable H.buckle_pixel_shift = riding_offset /decl/bodytype/quadruped/get_ignited_icon_state(mob/living/victim) diff --git a/code/modules/butchery/butchery_products.dm b/code/modules/butchery/butchery_products.dm index d12b2980a3af..f4e76d9af464 100644 --- a/code/modules/butchery/butchery_products.dm +++ b/code/modules/butchery/butchery_products.dm @@ -128,7 +128,7 @@ /obj/item/food/butchery/offal name = "offal" - desc = "An assortmant of organs and lumps of unidentified gristle. Packed with nutrients and bile." + desc = "An assortment of organs and lumps of unidentified gristle. Packed with nutrients and bile." icon = 'icons/obj/food/butchery/offal.dmi' material = /decl/material/solid/organic/meat/gut nutriment_amt = 15 diff --git a/code/modules/butchery/butchery_products_meat.dm b/code/modules/butchery/butchery_products_meat.dm index aa4cdbd9a514..9907f21994ce 100644 --- a/code/modules/butchery/butchery_products_meat.dm +++ b/code/modules/butchery/butchery_products_meat.dm @@ -30,7 +30,7 @@ return ..() /obj/item/food/butchery/meat/syntiflesh - desc = "A slab of flesh synthetized from reconstituted biomass or artificially grown from chemicals." + desc = "A slab of flesh synthesized from reconstituted biomass or artificially grown from chemicals." meat_name = "synthetic" // Seperate definitions because some food likes to know if it's human. @@ -60,7 +60,7 @@ butchery_data = /decl/butchery_data/animal/small/fowl /obj/item/food/butchery/meat/corgi - desc = "Tastes like... well you know..." + desc = "Tastes like... well, you know..." butchery_data = /decl/butchery_data/animal/corgi /obj/item/food/butchery/meat/xeno diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index f83344b4841e..b27ec40f29d6 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -122,7 +122,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the //all of our asset datums, used for referring to these later var/global/list/asset_datums = list() -//get a assetdatum or make a new one +//get an assetdatum or make a new one /proc/get_asset_datum(var/type) if (!(type in asset_datums)) return new type() diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 4a85cb47cef1..2af46afe2726 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -284,7 +284,7 @@ /obj/item/clothing/mask/chameleon name = "gas mask" icon = 'icons/clothing/mask/gas_mask_full.dmi' - desc = "It looks like a plain gask mask, but on closer inspection, it seems to have a small dial inside." + desc = "It looks like a plain gas mask, but on closer inspection, it seems to have a small dial inside." origin_tech = @'{"esoteric":3}' item_flags = ITEM_FLAG_INVALID_FOR_CHAMELEON bodytype_equip_flags = null diff --git a/code/modules/clothing/dresses/misc.dm b/code/modules/clothing/dresses/misc.dm index 20085a74b6cb..08969f3ae87c 100644 --- a/code/modules/clothing/dresses/misc.dm +++ b/code/modules/clothing/dresses/misc.dm @@ -25,18 +25,18 @@ /obj/item/clothing/dress/saloon name = "saloon girl dress" - desc = "A old western inspired gown for the girl who likes to drink." + desc = "An old western-inspired gown for the girl who likes to drink." icon = 'icons/clothing/dresses/dress_saloon.dmi' /obj/item/clothing/dress/cap name = "captain's dress uniform" - desc = "Feminine fashion for the style concious captain." + desc = "Feminine fashion for the style-conscious captain." icon = 'icons/clothing/dresses/uniform_captain_dress.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS /obj/item/clothing/dress/hop name = "head of personnel dress uniform" - desc = "Feminine fashion for the style concious HoP." + desc = "Feminine fashion for the style-conscious HoP." icon = 'icons/clothing/dresses/dress_hop.dmi' body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_ARMS diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 17022402e0aa..5341391d4d38 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -87,7 +87,7 @@ /obj/item/clothing/glasses/threedglasses name = "3D glasses" - desc = "A long time ago, people used these glasses to makes images from screens threedimensional." + desc = "A long time ago, people used these glasses to makes images from screens three-dimensional." icon = 'icons/clothing/eyes/glasses_3d.dmi' body_parts_covered = 0 diff --git a/code/modules/clothing/glasses/sunglasses.dm b/code/modules/clothing/glasses/sunglasses.dm index c31ff5ec7554..7cb0c0d47084 100644 --- a/code/modules/clothing/glasses/sunglasses.dm +++ b/code/modules/clothing/glasses/sunglasses.dm @@ -1,6 +1,6 @@ /obj/item/clothing/glasses/sunglasses name = "sunglasses" - desc = "Glasses with treated lenses to prevent glare. They provide some rudamentary protection from dazzling attacks." + desc = "Glasses with treated lenses to prevent glare. They provide some rudimentary protection from dazzling attacks." icon = 'icons/clothing/eyes/sunglasses.dmi' darkness_view = -1 flash_protection = FLASH_PROTECTION_NONE diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index a435e585d3c5..ae93b592aeb3 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -33,7 +33,7 @@ /obj/item/clothing/head/that name = "top-hat" - desc = "It's an amish looking hat." + desc = "It's an Amish-looking hat." icon = 'icons/clothing/head/tophat.dmi' siemens_coefficient = 0.9 @@ -78,7 +78,7 @@ /obj/item/clothing/head/rabbitears name = "rabbit ears" - desc = "Wearing these makes you looks useless, and only good for your sex appeal." + desc = "Wearing these makes you look useless, and only good for your sex appeal." icon = 'icons/clothing/head/bunny.dmi' body_parts_covered = 0 flags_inv = 0 @@ -220,7 +220,7 @@ /obj/item/clothing/head/tank name = "padded cap" - desc = "A padded skullcup for those prone to bumping their heads against hard surfaces." + desc = "A padded skullcap for those prone to bumping their head against hard surfaces." icon = 'icons/clothing/head/tank.dmi' flags_inv = BLOCK_HEAD_HAIR color = "#5f5f5f" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 01d01335e585..a665d9698530 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -84,7 +84,7 @@ /obj/item/clothing/head/welding/knight name = "knightly welding helmet" - desc = "A painted welding helmet, this one looks like a knights helmet." + desc = "A painted welding helmet, this one looks like a knight's helmet." icon = 'icons/clothing/head/welding/knight.dmi' /obj/item/clothing/head/welding/fancy @@ -224,7 +224,7 @@ add_overlay(emissive_overlay(icon, "[icon_state]-flame")) z_flags |= ZMM_MANGLE_PLANES -// Overidable so species with limited headspace in the sprite bounding area can offset it (scavs) +// Overrideable so species with limited headspace in the sprite bounding area can offset it (scavs) /obj/item/clothing/head/cakehat/proc/get_mob_flame_overlay(var/image/overlay, var/bodytype) if(overlay && check_state_in_icon("[overlay.icon_state]-flame", overlay.icon)) return emissive_overlay(overlay.icon, "[overlay.icon_state]-flame") diff --git a/code/modules/clothing/jumpsuits/job.dm b/code/modules/clothing/jumpsuits/job.dm index 90eb1ae24bbe..5c637e6e892e 100644 --- a/code/modules/clothing/jumpsuits/job.dm +++ b/code/modules/clothing/jumpsuits/job.dm @@ -144,7 +144,7 @@ ) /obj/item/clothing/jumpsuit/psych - desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist." + desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist." name = "psychiatrist's jumpsuit" icon = 'icons/clothing/jumpsuits/jumpsuit_psych.dmi' diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 06d78421b29e..02584ae53113 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -22,7 +22,7 @@ permeability_coefficient = 0.01 /obj/item/clothing/mask/breath/emergency - desc = "A close-fitting mask that is used by the wallmounted emergency oxygen pump." + desc = "A close-fitting mask that is used by the wall-mounted emergency oxygen pump." name = "emergency mask" permeability_coefficient = 0.50 diff --git a/code/modules/clothing/masks/chewable.dm b/code/modules/clothing/masks/chewable.dm index 84d490148fb9..8fe3c3562cc1 100644 --- a/code/modules/clothing/masks/chewable.dm +++ b/code/modules/clothing/masks/chewable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/chewable + abstract_type = /obj/item/clothing/mask/chewable name = "chewable item master" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/chewables/lollipop.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -55,7 +55,7 @@ /obj/item/clothing/mask/chewable/tobacco name = "wad" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face." throw_speed = 0.5 icon = 'icons/clothing/mask/chewables/chew.dmi' type_butt = /obj/item/trash/cigbutt/spitwad @@ -89,14 +89,14 @@ /obj/item/clothing/mask/chewable/tobacco/lenni name = "chewing tobacco" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like a ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrups so it tastes less like an ash-tray when you stuff it into your face." /obj/item/clothing/mask/chewable/tobacco/lenni/populate_reagents() add_to_reagents(/decl/material/solid/tobacco, 2) /obj/item/clothing/mask/chewable/tobacco/redlady name = "chewing tobacco" - desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like a ash-tray when you stuff it into your face" + desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrups so it doesn't taste like an ash-tray when you stuff it into your face" /obj/item/clothing/mask/chewable/tobacco/redlady/populate_reagents() add_to_reagents(/decl/material/solid/tobacco/fine, 2) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 7ceb955904cb..afabff1f337f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -146,7 +146,7 @@ /obj/item/clothing/mask/rubber/barros name = "Amaya Barros mask" - desc = "Current Secretary-General of Sol Cental Government. Not that the real thing would visit this pigsty." + desc = "Current Secretary-General of Sol Central Government. Not that the real thing would visit this pigsty." icon = 'icons/clothing/mask/barros.dmi' visible_name = "Amaya Barros" diff --git a/code/modules/clothing/masks/smokable.dm b/code/modules/clothing/masks/smokable.dm index 675783b875e1..4aa4fd8cb5ef 100644 --- a/code/modules/clothing/masks/smokable.dm +++ b/code/modules/clothing/masks/smokable.dm @@ -1,6 +1,6 @@ /obj/item/clothing/mask/smokable + abstract_type = /obj/item/clothing/mask/smokable name = "smokable item" - desc = "You're not sure what this is. You should probably ahelp it." icon = 'icons/clothing/mask/smokables/cigarette.dmi' body_parts_covered = 0 bodytype_equip_flags = null @@ -492,7 +492,7 @@ ///////////////// /obj/item/clothing/mask/smokable/pipe name = "smoking pipe" - desc = "A pipe, for smoking. Probably made of meershaum or something." + desc = "A pipe, for smoking. Probably made of meerschaum or something." icon = 'icons/clothing/mask/smokables/pipe.dmi' w_class = ITEM_SIZE_TINY smoketime = 0 diff --git a/code/modules/clothing/shirts/sweaters.dm b/code/modules/clothing/shirts/sweaters.dm index 1e19f372e890..5065789b2ed0 100644 --- a/code/modules/clothing/shirts/sweaters.dm +++ b/code/modules/clothing/shirts/sweaters.dm @@ -4,6 +4,6 @@ icon = 'icons/clothing/shirts/uniform_turtleneck.dmi' /obj/item/clothing/shirt/sweater/turquoise - name = "turqouise turtleneck" - desc = "A turqouise sweater and a pair of dark blue slacks." + name = "turquoise turtleneck" + desc = "A turquoise sweater and a pair of dark blue slacks." icon = 'icons/clothing/shirts/uniform_turtleneck_blue.dmi' diff --git a/code/modules/clothing/shirts/syndicate.dm b/code/modules/clothing/shirts/syndicate.dm index ab2498cc055b..a131a36a7e79 100644 --- a/code/modules/clothing/shirts/syndicate.dm +++ b/code/modules/clothing/shirts/syndicate.dm @@ -1,6 +1,6 @@ /obj/item/clothing/shirt/syndicate name = "tactical turtleneck" - desc = "It's some non-descript, slightly suspicious looking, turtleneck sweater." + desc = "It's some nondescript, slightly suspicious looking, turtleneck sweater." icon = 'icons/clothing/shirts/sweater_tactical.dmi' armor = list( ARMOR_MELEE = ARMOR_MELEE_SMALL, diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 53579e0dd79a..a2d298807ddb 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -153,7 +153,7 @@ /obj/item/clothing/shoes/athletic name = "athletic shoes" - desc = "A pair of sleek atheletic shoes. Made by and for the sporty types." + desc = "A pair of sleek athletic shoes. Made by and for the sporty types." icon = 'icons/clothing/feet/sports.dmi' /obj/item/clothing/shoes/dress/sneakies diff --git a/code/modules/clothing/skirts/job.dm b/code/modules/clothing/skirts/job.dm index 11cbba468ba5..2f4dd7a17c0b 100644 --- a/code/modules/clothing/skirts/job.dm +++ b/code/modules/clothing/skirts/job.dm @@ -1,6 +1,6 @@ /obj/item/clothing/skirt/research_director name = "chief science officer dress uniform" - desc = "Feminine fashion for the style concious CSO. Its fabric provides minor protection from biological contaminants." + desc = "Feminine fashion for the style-conscious CSO. Its fabric provides minor protection from biological contaminants." icon = 'icons/clothing/dresses/dress_rd.dmi' armor = list( ARMOR_BIO = ARMOR_BIO_MINOR diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index f6a35661567b..6ba6b837d81c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -200,7 +200,7 @@ /obj/item/rig_module/mounted name = "mounted gun" - desc = "Somesort of mounted gun." + desc = "Some sort of mounted gun." selectable = 1 usable = 1 module_cooldown = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index c263a126afda..5536a7500307 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -104,7 +104,7 @@ if(!card) card = new /obj/item/aicard(src) - // Terminal interaction only works with an inteliCarded AI. + // Terminal interaction only works with an intelliCarded AI. if(!istype(card)) return 0 @@ -328,7 +328,7 @@ /obj/item/rig_module/power_sink name = "hardsuit power sink" - desc = "An heavy-duty power sink." + desc = "A heavy-duty power sink." icon_state = "powersink" toggleable = 1 activates_on_touch = 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 893ec665f882..a616b18c7574 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -10,7 +10,7 @@ /obj/item/rig_module name = "hardsuit upgrade" - desc = "It looks pretty sciency." + desc = "It looks pretty science-y." icon = 'icons/obj/rig_modules.dmi' icon_state = "module" material = /decl/material/solid/metal/steel diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f9f4f356c2bb..b76278d5ebd8 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -444,7 +444,7 @@ return 1 return 0 -/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconcious, var/obj/item/rig_module/mod, var/user_is_ai) +/obj/item/rig/proc/check_power_cost(var/mob/living/user, var/cost, var/use_unconscious, var/obj/item/rig_module/mod, var/user_is_ai) if(!istype(user)) return 0 @@ -457,7 +457,7 @@ fail_msg = "You must be wearing \the [src] to do this." if(sealing) fail_msg = "The hardsuit is in the process of adjusting seals and cannot be activated." - else if(!fail_msg && ((use_unconcious && user.stat > 1) || (!use_unconcious && user.stat))) + else if(!fail_msg && ((use_unconscious && user.stat > 1) || (!use_unconscious && user.stat))) fail_msg = "You are in no fit state to do that." else if(!cell) fail_msg = "There is no cell installed in the suit." diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 4c8fba5849f8..bce77c8c0725 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -2,7 +2,7 @@ /obj/item/clothing/head/bio_hood name = "bio hood" icon = 'icons/clothing/head/biosuit/_biosuit.dmi' - desc = "A hood that protects the head and face from biological comtaminants." + desc = "A hood that protects the head and face from biological contaminants." permeability_coefficient = 0 armor = list( ARMOR_BIO = ARMOR_BIO_SHIELDED, diff --git a/code/modules/clothing/suits/dashiki.dm b/code/modules/clothing/suits/dashiki.dm index c61e603a7ae9..ac14b45bd604 100644 --- a/code/modules/clothing/suits/dashiki.dm +++ b/code/modules/clothing/suits/dashiki.dm @@ -1,16 +1,16 @@ /obj/item/clothing/suit/dashiki name = "black dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is green and black." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is green and black." icon = 'icons/clothing/suits/dashiki/dashiki.dmi' slot_flags = SLOT_OVER_BODY accessory_slot = ACCESSORY_SLOT_DECOR /obj/item/clothing/suit/dashiki/red name = "red dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is red." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is red." icon = 'icons/clothing/suits/dashiki/dashiki_red.dmi' /obj/item/clothing/suit/dashiki/blue name = "blue dashiki" - desc = "An ornately embroidered pullover garmant sporting a v-shaped collar. This one is blue." + desc = "An ornately embroidered pullover garment sporting a v-shaped collar. This one is blue." icon = 'icons/clothing/suits/dashiki/dashiki_blue.dmi' diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 24f7d5f0a72c..764b696000de 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -39,7 +39,7 @@ /obj/item/clothing/suit/toggle/labcoat/mad name = "The Mad's labcoat" - desc = "It makes you look capable of konking someone on the noggin and shooting them into space." + desc = "It makes you look capable of conking someone on the noggin and shooting them into space." color = COLOR_GREEN /obj/item/clothing/suit/toggle/labcoat/chemist diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 900580dffe8e..25aa1a94bbdd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -87,9 +87,10 @@ body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT +// todo: remove 40k reference? /obj/item/clothing/suit/imperium_monk name = "Imperium monk" - desc = "Have YOU killed a xenos today?" + desc = "Have YOU killed a xeno today?" icon = 'icons/clothing/suits/w40k.dmi' body_parts_covered = SLOT_HEAD|SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_FEET|SLOT_ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/suits/wizard.dm b/code/modules/clothing/suits/wizard.dm index c8f0208fb4d5..d302f06103f5 100644 --- a/code/modules/clothing/suits/wizard.dm +++ b/code/modules/clothing/suits/wizard.dm @@ -7,7 +7,7 @@ /obj/item/clothing/suit/wizrobe/red name = "red wizard robe" - desc = "A rather ratty red robe." + desc = "A rather ratty red robe." icon = 'icons/clothing/suits/wizard/red.dmi' /obj/item/clothing/suit/wizrobe/marisa diff --git a/code/modules/clothing/webbing/misc.dm b/code/modules/clothing/webbing/misc.dm index 74d41a0c4913..c390a9bf2edf 100644 --- a/code/modules/clothing/webbing/misc.dm +++ b/code/modules/clothing/webbing/misc.dm @@ -6,7 +6,7 @@ /obj/item/clothing/webbing/bandolier name = "bandolier" - desc = "A lightweight synthethic bandolier with straps for holding ammunition or other small objects." + desc = "A lightweight synthetic bandolier with straps for holding ammunition or other small objects." icon = 'icons/obj/items/bandolier.dmi' storage = /datum/storage/pockets/bandolier diff --git a/code/modules/codex/categories/category_surgery.dm b/code/modules/codex/categories/category_surgery.dm index 7bf78fccfc73..df818b89c80d 100644 --- a/code/modules/codex/categories/category_surgery.dm +++ b/code/modules/codex/categories/category_surgery.dm @@ -26,7 +26,7 @@
  • Use a scalpel to make an incision.
  • Use a retractor to widen the incision, if necessary.
  • Use a hemostat to clamp any bleeders, if necessary.
    • -
  • On bodyparts with bone encasement, like the skull and ribs, use a circular saw to open the encasing bone.
    • +
  • On body parts with bone encasement, like the skull and ribs, use a circular saw to open the encasing bone.

    • Closing an incision

    diff --git a/code/modules/codex/entries/guides.dm b/code/modules/codex/entries/guides.dm index 747a279d6915..7f3ec5d857f5 100644 --- a/code/modules/codex/entries/guides.dm +++ b/code/modules/codex/entries/guides.dm @@ -559,7 +559,7 @@

    A note on terms