From 17031f6793e92bde720f3b26f7c7ce1a438ce3f1 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 1 Nov 2023 19:42:10 +0300 Subject: [PATCH 01/16] centcom minor changes somebodey stole some statues --- _maps/map_files220/generic/centcomm.dmm | 93 +++++++++---------------- 1 file changed, 34 insertions(+), 59 deletions(-) diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index e6f61f2e1a99..df70b61a9bb3 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -37,7 +37,6 @@ /obj/effect/turf_decal/plaque{ layer = 3 }, -/obj/structure/statue/ell_good, /obj/structure/sign/poster/contraband/random/east, /turf/simulated/floor/redgrid, /area/syndicate_mothership) @@ -5349,16 +5348,11 @@ /turf/simulated/floor/plasteel/dark, /area/centcom/ss220/jail) "dGO" = ( -/obj/structure/statue/ell_good{ +/obj/structure/statue/elwycco{ layer = 4; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" + pixel_y = 9 }, +/turf/simulated/floor/plasteel/goonplaque/memorial, /area/centcom/ss220/park) "dHo" = ( /obj/machinery/light/spot, @@ -5382,12 +5376,7 @@ layer = 4; pixel_y = 9 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque/memorial, /area/centcom/ss220/park) "dIb" = ( /obj/machinery/economy/vending/security, @@ -5665,17 +5654,14 @@ /turf/simulated/wall/indestructible/riveted, /area/centcom/ss220/library) "dOQ" = ( -/obj/structure/statue/elwycco{ - layer = 4; - pixel_y = 9 +/obj/effect/turf_decal/plaque{ + layer = 3 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" +/obj/structure/statue/plastitanium/kidanstatue{ + pixel_y = 5 }, -/area/centcom/ss220/park) +/turf/simulated/floor/redgrid, +/area/syndicate_mothership) "dOS" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/wood/fancy/cherry, @@ -10905,12 +10891,10 @@ }, /area/centcom/ss220/admin1) "hqY" = ( -/obj/effect/turf_decal/plaque{ - layer = 3 - }, -/obj/structure/statue/furukai, -/turf/simulated/floor/redgrid, -/area/syndicate_mothership) +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/siding/wideplating/dark/corner, +/turf/simulated/floor/grass/jungle/no_creep, +/area/centcom/ss220/park) "hra" = ( /obj/structure/flora/ausbushes/ppflowers, /obj/structure/flora/ausbushes/ywflowers, @@ -20547,16 +20531,11 @@ /turf/simulated/floor/plating/airless, /area/shuttle/syndicate_sit) "oks" = ( -/obj/structure/statue/mooniverse{ - layer = 4; - pixel_y = 8 - }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" +/obj/structure/flora/grass/jungle, +/obj/effect/turf_decal/siding/wideplating/dark/corner{ + dir = 8 }, +/turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/park) "okL" = ( /obj/machinery/economy/vending/clothing, @@ -25540,6 +25519,7 @@ pixel_y = 0 }, /obj/structure/flora/junglebush, +/obj/effect/turf_decal/siding/wideplating/dark, /turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/park) "rLD" = ( @@ -29319,6 +29299,11 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/elite_squad) +"utP" = ( +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/siding/wideplating/dark, +/turf/simulated/floor/grass/jungle/no_creep, +/area/centcom/ss220/park) "utQ" = ( /obj/machinery/economy/vending/cigarette/free, /turf/simulated/floor/plasteel{ @@ -31426,16 +31411,11 @@ }, /area/syndicate_mothership) "vWq" = ( -/obj/structure/statue/furukai{ +/obj/structure/statue/mooniverse{ layer = 4; pixel_y = 8 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque/memorial, /area/centcom/ss220/park) "vWR" = ( /obj/machinery/door/airlock/centcom{ @@ -34340,12 +34320,7 @@ layer = 4; pixel_y = 9 }, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; - dir = 4; - icon_state = "plaque"; - name = "Comemmorative Plaque" - }, +/turf/simulated/floor/plasteel/goonplaque/memorial, /area/centcom/ss220/park) "xOF" = ( /turf/simulated/floor/plating, @@ -43253,7 +43228,7 @@ gOQ gOQ gOQ fnU -hqY +cFP gHP srn srn @@ -43510,7 +43485,7 @@ nGr nXD rrb fnU -cFP +dOQ gHP srn srn @@ -54655,7 +54630,7 @@ pGW qvv xGd xkj -eVw +oks dGO buT buT @@ -54914,7 +54889,7 @@ qvv qvv eVw rLs -dOQ +buT buT buT buT @@ -55170,8 +55145,8 @@ qvv qvv qvv mcG -pUg -oks +utP +buT buT buT buT @@ -55426,7 +55401,7 @@ iKO xGd qvv pUg -eVw +hqY vWq kAL buT From 0aabee12e5ec53c9cd2113f6cb98d49d758fb2d4 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 1 Nov 2023 19:57:40 +0300 Subject: [PATCH 02/16] statue code removal they're gone --- .../unique_objects/code/unique_objects.dm | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/modular_ss220/unique_objects/code/unique_objects.dm b/modular_ss220/unique_objects/code/unique_objects.dm index 337ca28dab6d..1e1ea305e0a7 100644 --- a/modular_ss220/unique_objects/code/unique_objects.dm +++ b/modular_ss220/unique_objects/code/unique_objects.dm @@ -21,31 +21,6 @@ anchored = TRUE oreAmount = 0 -/obj/structure/statue/ell_good - name = "Mr.Буум" - desc = "Загадочный клоун с жёлтым оттенком кожи и выразительными зелёными глазами. Лучший двойной агент синдиката, получивший власть над множеством фасилити. \ - Его имя часто произносят неправильно из-за чего его заслуги по документам принадлежат сразу нескольким Буумам. \ - Так же знаменит тем, что убедил руководство НТ тратить время, силы и средства, на золотой унитаз." - icon = 'modular_ss220/unique_objects/icons/statuelarge.dmi' - icon_state = "ell_good" - pixel_y = 7 - anchored = TRUE - oreAmount = 0 - -/obj/structure/statue/furukai - name = "София Вайт" - desc = "Загадочная девушка, ныне одна из множества офицеров синдиката. Получившая столь высокую позицию не за связи, а за свои способности. \ - Движимая местью за потерю родной сестры из-за коррупционных верхушек Нанотрейзен, она вступила в Синдикат, \ - где стала известна и как способный агент и как отличный инженер. Хоть ее позывной и отсылал на пушистых, в душе она их ненавидела... \ - Но по итогу при смене руководства Синдиката, вскрылись множественные проблемы, скрывающиеся доселе в стенах Синдиката. \ - Буквально в стенах Синдиката. Попавшие под её руководство базы имели очень специфичные методы построек, из-за чего \ - нередко служили причиной их краха. " - icon = 'modular_ss220/unique_objects/icons/statuelarge.dmi' - icon_state = "furukai" - pixel_y = 7 - anchored = TRUE - oreAmount = 0 - /obj/structure/statue/mooniverse name = "Неизвестный агент" desc = "Информация на табличке под статуей исцарапана и нечитабельна... Поверх написано невнятное словосочетание из слов \"Furry\" и \"Universe\"" From 7e39e2e55a0bd6d85fafe93c19e400d9f83cf4e5 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 1 Nov 2023 20:01:59 +0300 Subject: [PATCH 03/16] Ell_good comeback but only on sindy Centcom --- _maps/map_files220/generic/centcomm.dmm | 42 +++++++++--------- .../unique_objects/code/unique_objects.dm | 11 +++++ .../unique_objects/icons/statuelarge.dmi | Bin 12038 -> 11474 bytes 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index df70b61a9bb3..94c8c93ba6aa 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -5654,14 +5654,10 @@ /turf/simulated/wall/indestructible/riveted, /area/centcom/ss220/library) "dOQ" = ( -/obj/effect/turf_decal/plaque{ - layer = 3 - }, -/obj/structure/statue/plastitanium/kidanstatue{ - pixel_y = 5 - }, -/turf/simulated/floor/redgrid, -/area/syndicate_mothership) +/obj/structure/flora/junglebush, +/obj/effect/turf_decal/siding/wideplating/dark, +/turf/simulated/floor/grass/jungle/no_creep, +/area/centcom/ss220/park) "dOS" = ( /obj/structure/chair/office/dark, /turf/simulated/floor/wood/fancy/cherry, @@ -10892,7 +10888,9 @@ /area/centcom/ss220/admin1) "hqY" = ( /obj/structure/flora/grass/jungle, -/obj/effect/turf_decal/siding/wideplating/dark/corner, +/obj/effect/turf_decal/siding/wideplating/dark/corner{ + dir = 8 + }, /turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/park) "hra" = ( @@ -20532,9 +20530,7 @@ /area/shuttle/syndicate_sit) "oks" = ( /obj/structure/flora/grass/jungle, -/obj/effect/turf_decal/siding/wideplating/dark/corner{ - dir = 8 - }, +/obj/effect/turf_decal/siding/wideplating/dark/corner, /turf/simulated/floor/grass/jungle/no_creep, /area/centcom/ss220/park) "okL" = ( @@ -29299,11 +29295,6 @@ }, /turf/simulated/floor/plating, /area/syndicate_mothership/elite_squad) -"utP" = ( -/obj/structure/flora/junglebush, -/obj/effect/turf_decal/siding/wideplating/dark, -/turf/simulated/floor/grass/jungle/no_creep, -/area/centcom/ss220/park) "utQ" = ( /obj/machinery/economy/vending/cigarette/free, /turf/simulated/floor/plasteel{ @@ -32619,6 +32610,15 @@ }, /turf/simulated/floor/mineral/plastitanium, /area/syndicate_mothership/infteam) +"wNr" = ( +/obj/effect/turf_decal/plaque{ + layer = 3 + }, +/obj/structure/statue/ell_good{ + pixel_y = 6 + }, +/turf/simulated/floor/redgrid, +/area/syndicate_mothership) "wNB" = ( /turf/simulated/floor/carpet/red, /area/centcom/ss220/admin2) @@ -43485,7 +43485,7 @@ nGr nXD rrb fnU -dOQ +wNr gHP srn srn @@ -54630,7 +54630,7 @@ pGW qvv xGd xkj -oks +hqY dGO buT buT @@ -55145,7 +55145,7 @@ qvv qvv qvv mcG -utP +dOQ buT buT buT @@ -55401,7 +55401,7 @@ iKO xGd qvv pUg -hqY +oks vWq kAL buT diff --git a/modular_ss220/unique_objects/code/unique_objects.dm b/modular_ss220/unique_objects/code/unique_objects.dm index 1e1ea305e0a7..a5fe0089e869 100644 --- a/modular_ss220/unique_objects/code/unique_objects.dm +++ b/modular_ss220/unique_objects/code/unique_objects.dm @@ -21,6 +21,17 @@ anchored = TRUE oreAmount = 0 +/obj/structure/statue/ell_good + name = "Mr.Буум" + desc = "Загадочный клоун с жёлтым оттенком кожи и выразительными зелёными глазами. Лучший двойной агент синдиката, получивший власть над множеством фасилити. \ + Его имя часто произносят неправильно из-за чего его заслуги по документам принадлежат сразу нескольким Буумам. \ + Так же знаменит тем, что убедил руководство НТ тратить время, силы и средства, на золотой унитаз." + icon = 'modular_ss220/unique_objects/icons/statuelarge.dmi' + icon_state = "ell_good" + pixel_y = 7 + anchored = TRUE + oreAmount = 0 + /obj/structure/statue/mooniverse name = "Неизвестный агент" desc = "Информация на табличке под статуей исцарапана и нечитабельна... Поверх написано невнятное словосочетание из слов \"Furry\" и \"Universe\"" diff --git a/modular_ss220/unique_objects/icons/statuelarge.dmi b/modular_ss220/unique_objects/icons/statuelarge.dmi index 7b52b10bcfeea617104495a9f1f5bc6282bfa231..23d2ac317889fb78ef26ec3349a709de562d5a46 100644 GIT binary patch literal 11474 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 D_}hG; literal 12038 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 XIlBO}#IeIZYzHXHs>#$znTGx!^k$An From 3075b4129c86eb9cbaa5af10df73f73b983f1661 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 18:26:47 +0300 Subject: [PATCH 04/16] add: centcom tactical bat WEAPON OF JUSTICE --- modular_ss220/objects/code/weapons.dm | 80 ++++++++++++++++++ .../objects/icons/inhands/melee_lefthand.dmi | Bin 0 -> 896 bytes .../objects/icons/inhands/melee_righthand.dmi | Bin 0 -> 878 bytes modular_ss220/objects/icons/melee.dmi | Bin 0 -> 787 bytes modular_ss220/outfits/code/outfits.dm | 2 + 5 files changed, 82 insertions(+) create mode 100644 modular_ss220/objects/icons/inhands/melee_lefthand.dmi create mode 100644 modular_ss220/objects/icons/inhands/melee_righthand.dmi create mode 100644 modular_ss220/objects/icons/melee.dmi diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index f12097faa503..9114117f38c8 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -156,3 +156,83 @@ max_ammo = 100 icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "mm127_box" + +/obj/item/melee/baseball_bat/homerun/central_command + name = "тактическая бита Флота NanoTrasen" + desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. \ + В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ + Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \ + и инструментом высшего правосудия." + slot_flags = SLOT_FLAG_BELT + w_class = WEIGHT_CLASS_SMALL + + var/on = FALSE + /// Force when concealed + force = 5 + /// Force when extended + var/force_on = 20 + /// Item state when concealed + lefthand_file = 'modular_ss220/objects/icons/inhands/melee_lefthand.dmi' + righthand_file = 'modular_ss220/objects/icons/inhands/melee_righthand.dmi' + + icon = 'modular_ss220/objects/icons/melee.dmi' + item_state = "centcom_bat_0" + /// Item state when extended + var/item_state_on = "centcom_bat_1" + /// Icon state when concealed + icon_state = "centcom_bat_0" + /// Icon state when extended + var/icon_state_on = "centcom_bat_1" + /// Sound to play when concealing or extending + var/extend_sound = 'sound/weapons/batonextend.ogg' + /// Attack verbs when concealed (created on Initialize) + attack_verb = list("hit", "poked") + /// Attack verbs when extended (created on Initialize) + var/list/attack_verb_on = list("smacked", "struck", "cracked", "beaten") + +/obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload) + . = ..() + icon_state = on ? icon_state_on : initial(icon_state) + force = on ? force_on : initial(force) + attack_verb = on ? attack_verb_on : initial(attack_verb) + w_class = on ? WEIGHT_CLASS_HUGE : WEIGHT_CLASS_SMALL + homerun_able = on + +/obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) + . = ..() + if(!(user.mind.offstation_role)) + user.Weaken(5) + user.unEquip(src, force, silent = FALSE) + to_chat(user, "\"Это - оружие истинного правосудия. Тебе не дано обуздать его мощь.\"") + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) + else + user.adjustBruteLoss(rand(force/2, force)) + return + +/obj/item/melee/baseball_bat/homerun/central_command/attack_self(mob/user) + on = !on + icon_state = on ? icon_state_on : initial(icon_state) + if(on) + to_chat(user, "Вы активировали [src.name] - время для правосудия!") + item_state = item_state_on + w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance + force = force_on + attack_verb = attack_verb_on + homerun_ready = TRUE + else + to_chat(user, "Вы деактивировали [src.name].") + item_state = initial(item_state) + slot_flags = SLOT_FLAG_BELT + w_class = WEIGHT_CLASS_SMALL + force = initial(force) + attack_verb = initial(attack_verb) + homerun_ready = FALSE + // Update mob hand visuals + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.update_inv_l_hand() + H.update_inv_r_hand() + playsound(loc, extend_sound, 50, TRUE) + add_fingerprint(user) diff --git a/modular_ss220/objects/icons/inhands/melee_lefthand.dmi b/modular_ss220/objects/icons/inhands/melee_lefthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..03a217d2e15c8c9b438fef1d99b77b86f3b9ba96 GIT binary patch literal 896 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoWmO>&B`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrlsk66-#?_JI#$M_Z&LAja4_VkXSOa+jy;pp}FW0vm@(n2~5vQWev9%-;m7k zms{%$Ye;A|0|V1hPZ!6KiaBrR?(Y(D6lhQX=4L3Q_l5Tz;~5_p9v5a)0Y081C&WMc zx(N8~Fuvg6VrFO}a^woT#f~r2Y}dE6xt_cG>gKy&WodQsJECo)uik(6Cvw%xGQ0Wa zP04QR2Bj(tZcGWp605i>K7F})R8K~^X2Ndhqw+>}x{5 ze?HACOENol?3Q8HldxI)wubFz+f(;-cjd=Vj+^Vt&d;53^p=FQwaTw6QLzUO{;mA| z`uOu_=RVhlCy6C*1Zul>ZoSIRtx}5Rj?2yWZ@YhQ-ap?r4;LT*?|bInW{K{thJrh% z9*fRadSiA)C|XZk`ms*hipldoT+7;$<(qP`S)zyKfCmFv#1|ohZ}a|MIv(M^twHn4 z8+E0uvqA<_=hZ5&3ftbW@cWzRe}r_*R)tLmvG4EtyLaZjujWX-Q1i4!L8@ACbSR9N?Py5`?g zyWib<`eZ-%>e8au%$Ho&d+m6&RYOhvfQRtBu#Gn?=UW~13u^fI{+I46k=uguySU$+ zGWGq>dXRMQi3khqOiR#sEo>tqydhVA-*m;b{vQH-4w&uz5!bfO?x6F<=9q$1}UC!63T%A>X{p+LZg;n2_SALU85S~^x>BP-o)s43{ z+h03rzRIrSY2NdR5{EZw=wF@RQoQYRL@H18%!(Orn0jL!flmIz$juWHS$RcxH84vt Nc)I$ztaD0e0sugnkpKVy literal 0 HcmV?d00001 diff --git a/modular_ss220/objects/icons/inhands/melee_righthand.dmi b/modular_ss220/objects/icons/inhands/melee_righthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..802a7b7052ead386b577ab3fc6b3899fafa8ab0a GIT binary patch literal 878 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoWmO>&B`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrlsk66-#?_JI#$M_Z&LAja4_VkXSOa+jy;pp}FW0vm@(n2~5vQWev9%-;m7k zms{%$Ye;A|0|V1$PZ!6KiaBrR?#;R#Akmf@tvi=VvY35mLtd=ci-1WBKL%)|Xw0or z-a9!+LuEpVN1H&?v_4txh1vQCCYZYA*&k+%{x`8!XRfraTLxOJzj}I; zj-X6!6?3dRQ-TVE8p{P2E@|F>@EX3K0VKb;UcYuB|P#^3$!ll$l2Q;WCzzc#I0VcNk>5zExpZB;n1 z@8{K11{X|Kf?$lM$P3NPEnfmN%#r^AAHa{U!XL71`-QEy~ z6XzOo3k)jeJ^87!bC*s2-w(3Wjso4csO8e*m+MjrivKRY*0^J}j_>@x_dk5kXtVF; zt+%P0Rc&a#Nd7^ae6(@8 z(dh}(PW|VKDi^!g9%0Sgck5i6o;CM=-PjjASIXoQn2V2ZsFjm7s_wJ9_E383y^f!D zR!h9+Hr{&QQY$Yj^m=hf*9v)t#s66k{$budB|LgVp7wlT24e7Z^>bP0l+XkKUZrtz literal 0 HcmV?d00001 diff --git a/modular_ss220/objects/icons/melee.dmi b/modular_ss220/objects/icons/melee.dmi new file mode 100644 index 0000000000000000000000000000000000000000..481ce4d8edffdea0bf7e54b1f924765273cb232e GIT binary patch literal 787 zcmV+u1MK{XP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFN-Bso7fJ}I#z-av_qGbOXA7$|PY#hF%=n41b=V^wX4OSQ6s ztDg(lF#!AVD#j!iFF*hQ0$52zK~#90<(R!|Q&AYkpL5T>HW-nJF`-gxbqInWE<(}F z4(ePL{09UTmkx^H;^v^V*2!6^lOWbr)K=U?1fdjBTd=7eIuuN~AIJ0Fa5a`5+=C4X|Ke*G zK)@RhYiM8Ejh`Pz!5DC`Su-YKGrq4AJ}u3^pZ0KKY$pQW$KGRen3H#6^g>l9HWy!; z05Z>c4dFzDwNLF7PI*0>;9F;n>Eh<)YZ1_cdkCZGuldK){KYEH--->D-x{Bf-@L6A zo+L^7dTX$YN6&v5FTWXI=@87|lzw<31jY>B`8<530+_e!&+~q`iSK+-zA^!=;X&aC z_4FcalrPFxB4FmOFJ4Zqg0p1^)F4>Zc=^ERh4@N-1+Gu-!}r-En3;Nu)0YLl{#Z6r zoRXD~;0Tnr!bP}$MI(8*fAIm%Tt^dpu0T9Spg=>Q=AlFsyxN1 zpTTUm;C@|}kF}SlI3u8cw|Mcu+-~8F0E&&>!kHOhYqxOf1lZUuoH+ru@*C-QbpneU RH4*>-002ovPDHLkV1jDYas>bY literal 0 HcmV?d00001 diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm index b35fc68b6dd6..5eaebc9de54e 100644 --- a/modular_ss220/outfits/code/outfits.dm +++ b/modular_ss220/outfits/code/outfits.dm @@ -74,6 +74,8 @@ /obj/item/ammo_box/speed_loader_mm127 = 3 ) +/datum/outfit/job/ntnavyofficer + l_pocket = /obj/item/melee/baseball_bat/homerun/central_command /obj/item/clothing/under/solgov/srt name = "marine uniform" From f640a5fb995c64447ad919d9afa7108a02ea47de Mon Sep 17 00:00:00 2001 From: Fullonibus <38350888+Fullonibus@users.noreply.github.com> Date: Fri, 10 Nov 2023 18:41:55 +0300 Subject: [PATCH 05/16] Update weapons.dm add comment --- modular_ss220/objects/code/weapons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 9114117f38c8..ed4b4383baf7 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -157,6 +157,7 @@ icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "mm127_box" +// Тактическая бита Флота NanoTrasen /obj/item/melee/baseball_bat/homerun/central_command name = "тактическая бита Флота NanoTrasen" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. \ From 08604e84df7ddccbcc0e10aa0c9873ce36443cad Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 19:00:18 +0300 Subject: [PATCH 06/16] fix: homerun issue --- modular_ss220/objects/code/weapons.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index ed4b4383baf7..468d648d6a4d 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -237,3 +237,7 @@ H.update_inv_r_hand() playsound(loc, extend_sound, 50, TRUE) add_fingerprint(user) + +/obj/item/melee/baseball_bat/homerun/central_command/attack(mob/living/target, mob/living/user) + . = ..() + homerun_ready = 1 From bd0b51071eef65321a824edaeb5a7a7f5cf6c6fc Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 19:28:16 +0300 Subject: [PATCH 07/16] fix: some code improvements --- modular_ss220/objects/code/weapons.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 468d648d6a4d..9c266a63ae9e 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -202,9 +202,9 @@ /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) . = ..() if(!(user.mind.offstation_role)) - user.Weaken(5) + user.Weaken(10 SECONDS) user.unEquip(src, force, silent = FALSE) - to_chat(user, "\"Это - оружие истинного правосудия. Тебе не дано обуздать его мощь.\"") + to_chat(user, span_userdanger("Это - оружие истинного правосудия. Тебе не дано обуздать его мощь.")) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) @@ -216,17 +216,17 @@ on = !on icon_state = on ? icon_state_on : initial(icon_state) if(on) - to_chat(user, "Вы активировали [src.name] - время для правосудия!") + to_chat(user, span_userdanger("Вы активировали [src.name] - время для правосудия!")) item_state = item_state_on w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance force = force_on attack_verb = attack_verb_on homerun_ready = TRUE else - to_chat(user, "Вы деактивировали [src.name].") + to_chat(user, span_notice("Вы деактивировали [src.name].")) item_state = initial(item_state) - slot_flags = SLOT_FLAG_BELT - w_class = WEIGHT_CLASS_SMALL + slot_flags = initial(slot_flags) + w_class = initial(w_class) force = initial(force) attack_verb = initial(attack_verb) homerun_ready = FALSE From 1d44bc359969aadf00dbcacc8f2d130c75cd4ec5 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 19:45:21 +0300 Subject: [PATCH 08/16] fix: linter and redundant code --- modular_ss220/objects/code/weapons.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 9c266a63ae9e..0e28b6814345 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -159,7 +159,7 @@ // Тактическая бита Флота NanoTrasen /obj/item/melee/baseball_bat/homerun/central_command - name = "тактическая бита Флота NanoTrasen" + name = "тактическая бита Флота Nanotrasen" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. \ В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \ @@ -225,7 +225,6 @@ else to_chat(user, span_notice("Вы деактивировали [src.name].")) item_state = initial(item_state) - slot_flags = initial(slot_flags) w_class = initial(w_class) force = initial(force) attack_verb = initial(attack_verb) From 8a585a4b77b7e36a4b16bae971fd088f9baef1f9 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 19:50:43 +0300 Subject: [PATCH 09/16] fix: linter --- modular_ss220/objects/code/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 0e28b6814345..8d61eb287a35 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -157,7 +157,7 @@ icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "mm127_box" -// Тактическая бита Флота NanoTrasen +// Тактическая бита Флота Nanotrasen /obj/item/melee/baseball_bat/homerun/central_command name = "тактическая бита Флота Nanotrasen" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. \ From 410b12dc186674247b9d867b3f6105f9a8547ce7 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 10 Nov 2023 20:03:54 +0300 Subject: [PATCH 10/16] fix: linter. And someone should fix my eyes --- modular_ss220/objects/code/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 8d61eb287a35..89cbcb666e56 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -162,7 +162,7 @@ name = "тактическая бита Флота Nanotrasen" desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. \ В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \ - Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \ + Выдаваясь только самым верным и эффективным офицерам Nanotrasen, это оружие является одновременно символом статуса \ и инструментом высшего правосудия." slot_flags = SLOT_FLAG_BELT w_class = WEIGHT_CLASS_SMALL From 19c77440f78b9e3cf5c8eb20720bd5ee529d2eaf Mon Sep 17 00:00:00 2001 From: Fullonibus <38350888+Fullonibus@users.noreply.github.com> Date: Fri, 10 Nov 2023 23:06:14 +0300 Subject: [PATCH 11/16] Update weapons.dm redundant span --- modular_ss220/objects/code/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 89cbcb666e56..7aa0b98ef853 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -216,7 +216,7 @@ on = !on icon_state = on ? icon_state_on : initial(icon_state) if(on) - to_chat(user, span_userdanger("Вы активировали [src.name] - время для правосудия!")) + to_chat(user, span_userdanger("Вы активировали [src.name] - время для правосудия!")) item_state = item_state_on w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance force = force_on From a9218e5ad9e5ead0ed3fb486be997fc8bc6de9dd Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 11 Nov 2023 17:01:27 +0300 Subject: [PATCH 12/16] fix: bat logic --- modular_ss220/objects/code/weapons.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 7aa0b98ef853..22474a9d089f 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -172,11 +172,11 @@ force = 5 /// Force when extended var/force_on = 20 - /// Item state when concealed + lefthand_file = 'modular_ss220/objects/icons/inhands/melee_lefthand.dmi' righthand_file = 'modular_ss220/objects/icons/inhands/melee_righthand.dmi' - icon = 'modular_ss220/objects/icons/melee.dmi' + /// Item state when concealed item_state = "centcom_bat_0" /// Item state when extended var/item_state_on = "centcom_bat_1" @@ -193,12 +193,8 @@ /obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload) . = ..() - icon_state = on ? icon_state_on : initial(icon_state) - force = on ? force_on : initial(force) - attack_verb = on ? attack_verb_on : initial(attack_verb) - w_class = on ? WEIGHT_CLASS_HUGE : WEIGHT_CLASS_SMALL + /// Ability to make homerun homerun_able = on - /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) . = ..() if(!(user.mind.offstation_role)) @@ -210,14 +206,14 @@ H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) else user.adjustBruteLoss(rand(force/2, force)) - return /obj/item/melee/baseball_bat/homerun/central_command/attack_self(mob/user) on = !on - icon_state = on ? icon_state_on : initial(icon_state) + if(on) to_chat(user, span_userdanger("Вы активировали [src.name] - время для правосудия!")) item_state = item_state_on + icon_state = icon_state_on w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance force = force_on attack_verb = attack_verb_on @@ -225,10 +221,13 @@ else to_chat(user, span_notice("Вы деактивировали [src.name].")) item_state = initial(item_state) + icon_state = initial(icon_state) w_class = initial(w_class) force = initial(force) attack_verb = initial(attack_verb) homerun_ready = FALSE + + homerun_able = on // Update mob hand visuals if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -239,4 +238,5 @@ /obj/item/melee/baseball_bat/homerun/central_command/attack(mob/living/target, mob/living/user) . = ..() - homerun_ready = 1 + if(on) + homerun_ready = 1 From 2c11e757328ab0dd66f4460368248a2b47145c2b Mon Sep 17 00:00:00 2001 From: Fullonibus <38350888+Fullonibus@users.noreply.github.com> Date: Sun, 12 Nov 2023 16:13:51 +0300 Subject: [PATCH 13/16] Update modular_ss220/objects/code/weapons.dm Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com> --- modular_ss220/objects/code/weapons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 22474a9d089f..3bf609304882 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -195,6 +195,7 @@ . = ..() /// Ability to make homerun homerun_able = on + /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) . = ..() if(!(user.mind.offstation_role)) From 4eca1ef2ee9d58bf31d3384e775e0ef3c2f7b03e Mon Sep 17 00:00:00 2001 From: Fullonibus <38350888+Fullonibus@users.noreply.github.com> Date: Mon, 13 Nov 2023 16:06:35 +0300 Subject: [PATCH 14/16] Update modular_ss220/objects/code/weapons.dm Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com> --- modular_ss220/objects/code/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 3bf609304882..c02f171d3936 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -204,7 +204,7 @@ to_chat(user, span_userdanger("Это - оружие истинного правосудия. Тебе не дано обуздать его мощь.")) if(ishuman(user)) var/mob/living/carbon/human/H = user - H.apply_damage(rand(force/2, force), BRUTE, pick("l_arm", "r_arm")) + H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) else user.adjustBruteLoss(rand(force/2, force)) From 64e347c5feb11e8bbd6a74d20c58f280cafd8829 Mon Sep 17 00:00:00 2001 From: Peter Date: Mon, 13 Nov 2023 16:20:58 +0300 Subject: [PATCH 15/16] fix: fix: bat logic --- modular_ss220/objects/code/weapons.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index c02f171d3936..8e955fbc1a98 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -191,11 +191,6 @@ /// Attack verbs when extended (created on Initialize) var/list/attack_verb_on = list("smacked", "struck", "cracked", "beaten") -/obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload) - . = ..() - /// Ability to make homerun - homerun_able = on - /obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user) . = ..() if(!(user.mind.offstation_role)) @@ -215,10 +210,9 @@ to_chat(user, span_userdanger("Вы активировали [src.name] - время для правосудия!")) item_state = item_state_on icon_state = icon_state_on - w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance + w_class = WEIGHT_CLASS_HUGE force = force_on attack_verb = attack_verb_on - homerun_ready = TRUE else to_chat(user, span_notice("Вы деактивировали [src.name].")) item_state = initial(item_state) @@ -226,7 +220,6 @@ w_class = initial(w_class) force = initial(force) attack_verb = initial(attack_verb) - homerun_ready = FALSE homerun_able = on // Update mob hand visuals @@ -238,6 +231,6 @@ add_fingerprint(user) /obj/item/melee/baseball_bat/homerun/central_command/attack(mob/living/target, mob/living/user) - . = ..() if(on) homerun_ready = 1 + . = ..() From 1951b2e1470d075ac18a83a52b5fedea640dd6a6 Mon Sep 17 00:00:00 2001 From: Aylong <69762909+Aylong220@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:59:23 +0200 Subject: [PATCH 16/16] Update modular_ss220/objects/code/weapons.dm Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> --- modular_ss220/objects/code/weapons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index 8e955fbc1a98..0981030bf776 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -232,5 +232,5 @@ /obj/item/melee/baseball_bat/homerun/central_command/attack(mob/living/target, mob/living/user) if(on) - homerun_ready = 1 + homerun_ready = TRUE . = ..()