From 036f9593177fb8c966e0c3fb645b248024aec573 Mon Sep 17 00:00:00 2001 From: Riverz1 Date: Fri, 19 Jul 2024 19:36:02 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=B8=D0=B7=D0=BE=D0=BB=D1=8F=D1=86=D0=B8=D0=BE=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BF=D0=B5=D1=80=D1=87=D0=B0=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B8=20=D1=81=D0=BE=D0=BB=D0=BD=D1=86=D0=B5=D0=B7=D0=B0?= =?UTF-8?q?=D1=89=D0=B8=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BE=D1=87=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=D0=BE=20=D0=BE=D0=B4=D0=B8=D0=BD=D0=B0=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D1=85=20=D1=81=D0=BF=D0=B0=D1=83=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?,=20=D0=B0=20=D1=82=D0=B0=D0=BA=D0=B6=D0=B5=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2=20=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D1=8B=20=D1=80=D0=B0=D0=B7=D0=B1?= =?UTF-8?q?=D1=80=D0=BE=D1=81=D0=B0=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=82=D0=B5=D1=85=20=D1=82=D0=BE=D0=BD=D0=B5=D0=BB=D1=8F=D0=BC?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5=20Box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Удалил с однаковых спаунов очки и изолционные перчатки, но добавил в рандомный спаун по тех тонелям Меньше манча Riverz :cl: Riverz - tweak: Удалены изоляционные перчатки и солнцезащитные очки со одинаковых спаунов, а также добавлены в рандомные предметы разбросаные по тех тонелям на карте Box --- code/_globalvars/lists/maintenance_loot.dm | 2 ++ maps/boxstation/boxstation.dmm | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 68ec8f8611f9..c4c336080f98 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -162,6 +162,8 @@ var/global/list/uncommon_loot = list( /obj/item/clothing/mask/muzzle = 1, /obj/item/clothing/ears/earmuffs = 1, /obj/item/clothing/gloves/black = 1, + /obj/item/clothing/gloves/insulated = 1, + /obj/item/clothing/glasses/sunglasses = 1, ) = 8, list( diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm index f97d288d31c8..b394b12fb6b6 100644 --- a/maps/boxstation/boxstation.dmm +++ b/maps/boxstation/boxstation.dmm @@ -21799,7 +21799,6 @@ /turf/simulated/floor, /area/station/ai_monitored/eva) "aMG" = ( -/obj/item/clothing/gloves/insulated, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet, /turf/simulated/floor/plating, @@ -68315,7 +68314,6 @@ "cIQ" = ( /obj/structure/rack, /obj/item/clothing/mask/gas/coloured, -/obj/item/clothing/glasses/sunglasses, /obj/effect/decal/turf_decal/set_damaged, /turf/simulated/floor/plating, /area/station/maintenance/medbay) @@ -76091,7 +76089,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/medbay) "jMb" = ( -/obj/item/clothing/gloves/insulated, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet/crate, /turf/simulated/floor/plating, From f98ec0d88f3e15481ce27b51e5c236751c9aea1a Mon Sep 17 00:00:00 2001 From: Riverz1 Date: Tue, 23 Jul 2024 01:19:14 +0400 Subject: [PATCH 2/6] zippo sindi --- code/datums/uplinks_items.dm | 6 ++++ code/game/machinery/vending/other.dm | 3 +- .../objects/items/weapons/cigs_lighters.dm | 6 ---- .../items/weapons/storage/uplink_kits.dm | 2 +- code/game/objects/items/weapons/tools.dm | 31 ++++++++++++++++++ icons/obj/items.dmi | Bin 86328 -> 86333 bytes 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/code/datums/uplinks_items.dm b/code/datums/uplinks_items.dm index 9987b5df813e..966e5c887d1a 100644 --- a/code/datums/uplinks_items.dm +++ b/code/datums/uplinks_items.dm @@ -1097,6 +1097,12 @@ item = /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate cost = 2 +/datum/uplink_item/badass/item/weapon/weldingtool/experimental/sindi + name = "Syndicate Zippo" + desc = "A very cool zippo and welding" + item = /obj/item/weapon/weldingtool/experimental/sindi + cost = 4 + /datum/uplink_item/badass/syndiedonuts name = "Syndicate Donuts" desc = "Special offer from Waffle Co., the box of 6 delicious donuts! But be careful, some of them are posioned!" diff --git a/code/game/machinery/vending/other.dm b/code/game/machinery/vending/other.dm index a4444b455f99..aafb6797dc9d 100644 --- a/code/game/machinery/vending/other.dm +++ b/code/game/machinery/vending/other.dm @@ -44,6 +44,7 @@ ) syndie = list( /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/weapon/weldingtool/experimental/sindi = 1, ) prices = list( /obj/item/weapon/storage/fancy/cigarettes = 20, @@ -215,7 +216,7 @@ /obj/item/clothing/head/sushi_band = 1, /obj/item/weapon/kitchen/utensil/spoon = 2, /obj/item/weapon/kitchen/rollingpin = 2, - /obj/item/weapon/kitchenknife/butch = 2, + /obj/item/weapon/kitchenknife/butch = 2, ) syndie = list( /obj/item/weapon/reagent_containers/glass/bottle/alphaamanitin/syndie = 1, diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 2b85f00e05ae..c6fabe2ea5b5 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -534,9 +534,3 @@ CIGARETTE PACKETS ARE IN FANCY.DM location.hotspot_expose(700, 5, src) return -/obj/item/weapon/lighter/zippo/syndi - icon_state = "syndizippo" - item_state = "syndizippo" - icon_on = "syndizippoon" - icon_off = "syndizippo" - light_color = LIGHT_COLOR_NUKE_OPS diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index f78f1ca6480e..e8f64cd22968 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -433,7 +433,7 @@ name = "chemical fighter kit" startswith = list( /obj/item/weapon/reagent_containers/watertank_backpack/syndie, - /obj/item/weapon/lighter/zippo/syndi, + /obj/item/weapon/weldingtool/experimental/sindi, /obj/item/weapon/gun/projectile/revolver/syndie, /obj/item/ammo_box/speedloader/a357 = 2, /obj/item/weapon/melee/energy/sword, diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 06b1442c69d9..1a95cc6721fb 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -515,6 +515,37 @@ if(!active && (get_fuel() == max_fuel)) STOP_PROCESSING(SSobj, src) +/obj/item/weapon/weldingtool/experimental/sindi + icon_state = "syndizippo" + name = "syndi zippo" + desc = "A very cool zippo" + icon = 'icons/obj/items.dmi' + w_class = SIZE_MINUSCULE + max_fuel = 150 + next_refuel_tick = 0 + +/obj/item/weapon/weldingtool/experimental/sindi/process() + if(active) + hitsound = SOUNDIN_LASERACT + if(icon_state != "syndizippo1") // Check that the sprite is correct, if it isnt, it means toggle() was not called + force = 15 + damtype = BURN + icon_state = initial(icon_state) + "1" + if(prob(5)) // passive fuel burning + use(1) + light_color = LIGHT_COLOR_NUKE_OPS + set_light(2) + else + hitsound = initial(hitsound) + if(icon_state != "syndizippo") // Check that the sprite is correct, if it isnt, it means toggle() was not called + force = 3 + damtype = BRUTE + icon_state = initial(icon_state) + active = FALSE + set_light(0) + if(!istype(src, /obj/item/weapon/weldingtool/experimental/sindi)) + STOP_PROCESSING(SSobj, src) + return /* * Crowbar */ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 514479d54ac5ea14a09f8692c41107724bfe82a1..54947299491be0a53c3e94d5b94683bde22c479f 100644 GIT binary patch delta 1360 zcmV-W1+V(Jq6NL81&|~G_>mg&%R=Xc22Q><>Q4;Po`XM68TSKU@O*XL&)`nD_MAGtum>b82< z`lh@)KXaaQbz5DXpEV3Uj{koGU8$&R6?G$0xiG{Q6Jy3G4{*zbLyaQVSYX#taLAWyU^%J2PXS`FkZ~)!p3`!0bGp{j37mc)3EXxe#+&mqhXD@N zZFRl5-dw-1)ueJlO``_?3?8E#8v+-GBoE+3 z%K5TG)0lndi@f>~xF4D(lTQH-e{$^IwuT51UI#xvuCl9(o6W-Sr8kohgFMPNp8NvS zxny#39+_NTs;lRiydyKYyp^|PCYQG#bl69EDfl2Stl|Tjmc7%F+y=;sRps9fa`ASj1`VUU7AH6joD|!_#Qy@f zg02H7MqY;j6Z@!H2pwY4mD`B+SU^4kMm7b=MRQ_|xNh4SS>=9q97jh?alOT=hh&H@ z7mD(1j=b~GQ(R2@Sw|%&Wh&Ke^~dJ=YV$H%6c&tUg5lS@9if=}eDOXNyWFroR6(_++A20;kD`DLsH?q3! z?&NpSqIaHxLaR2O(cpdYu^oKY)XxhGLrIbImV(3h{hJ!px&8j_wC;@Dip^lTA)CQ+ zTQ-B`=4=MbE!qtJB$HzUMG>O(Mod?Dh4ugCJji2H0I7qyB?0dnzHaVzn#e2F{j6Rw^&3YPjBis=qXp30g67{#R~1^KeD zh2cR_vexHJEcaI(c+QF8pgZg*T&E)@T%(gFSSOWcLs3YNN18P~#LW2{edH4yti^x~ znwJ7C^k{az7~4UA3g8tY?cwVy)X=Y}1B4yQoJ)w#hE+d47?I)aK~8bL)Vji92CMo>{kBPeI*!KXw^9nkDr@M`l!&^-90kTUrY zoqzBtk^J8N*#jO;< z;`5xL42<%BnjSfMN&jcHLOY_8;FSXn)axKaiqA|M zg|KSSseD=Jk>&no#8e&=1z=LV{Xc;!uYr0pjSre$Gf^(cTDoOCXjvcckc*bim^^4< zhXrl%cc_o@m_8*>L5(uT(qdE(B@RwMY>eYqbb8WGG=oB>w}BMj{6*XsirFNLZU{@) zLZ6=O$`>CuSDWL%vyuq3)Dm3J%s*|uJP9eATG3dZK+`ZS3-9;Uw|~A?Uw{5M{~x!g SYH4-Tw;O{X2Dcyv0T@efF`F;| delta 1355 zcmV-R1+@CTq6N631&|~G^N}Sif3(G$9n$9cGzt){Qd1m_4)g^^E>41DOR`DyNk>7v%Pnvt8S~C>+`b?ecP4sM=nsXx~<-{ zzA10c&z$F6-BwrUXAMJ-~xF4D(lTQH-fAZM7Z4D73ybgYRTxC}mH=Bj$r8kohgWStswEP0o zxny#39GP5R%B$y?ydyKYyp^|PCYQJGbl7`&Dfl2Stl|Tjmc7%F+y=;sRpKv54H`yyElzM6I4QP;iT??1 z1ziVF^t=uOCiYRY5IV%7OScj2v4DI8jBE;!i{``_aox5vvdaDJ*pH5w;(Ci!jbw-} z7mD(1j=b~GQ(O%DSw|%&Wh&Ke^~dJ=YV$H$6c&tUg5l#f8FD! zM~{~m?>E1AUJvBLAaCYwU+v|uo);6~!`+fB`=klUYfiyI53zXlwAw&>S@9in=}tip^lTAe+H* zSvG^^;%o-XCE5)BAd_PQMG+$PMogD@h4ugCJji2H0I7qyB?0dnzHaVzn#e2F`&6Rw^Y3YPjBis=qXp30g67{#R~1^KeD zh2cSwvexHJEZ0{Zc+QF8pgZg*T&E)@T%(gFSSOWcT~SDnN18P?#LW3G>c}TJSc?G} zG%p2O=+W$aF}8z$6u>J)%E^KlVk?h#;+1zM6R(QqL~G`?bOZZZbDetxP4M#G0iJ7U zjl&e^u%Z`cv9y2TT*Mr;h2&BpN7~mA6z>aoD40~YP$yEBX%i~TzX_FP<%G&|bwcGM zihL}+=7sJFl!t#J<Yh-=3zrir2Wmp)NKL35 zstHxRs~tFMB6Z~CI2}PnGL4`jl}1pJNF%67qY;#&^WamWr3z?vEqJwgB4{3bQb?J6 zh|d4d79MToO3t@kLEhT!`er6ubt~;}v?8ApC-U$ct;mPWiR9mCMIo+-GB7H>&l$?V zC@<=flh^crzgDZXBPvNA3f2Qh9q#a62SOnw>0@!w>(~Td+0j6~4l<>==3&8km94ii2Fh@n}pE~Vd-Az!;@Y4 z;{E1obNo9?i9ky=!S&4i!{*bIA!So5D$5gS8m49C{kHn@<8$@-`?vG|04l_56$YeG N#)BmWw Date: Tue, 23 Jul 2024 01:19:21 +0400 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=B8=D0=B7=D0=BE=D0=BB=D1=8F=D1=86=D0=B8=D0=BE?= =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=B5=D1=80=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D1=81=D0=BE=D0=BB=D0=BD=D1=86=D0=B5?= =?UTF-8?q?=D0=B7=D0=B0=D1=89=D0=B8=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BE=D1=87?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=BE=20=D0=BE=D0=B4=D0=B8=D0=BD=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2=D1=8B=D1=85=20=D1=81=D0=BF=D0=B0=D1=83=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2,=20=D0=B0=20=D1=82=D0=B0=D0=BA=D0=B6=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B2?= =?UTF-8?q?=20=D1=80=D0=B0=D0=BD=D0=B4=D0=BE=D0=BC=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=BC=D0=B5=D1=82=D1=8B=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B1=D1=80=D0=BE=D1=81=D0=B0=D0=BD=D1=8B=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=82=D0=B5=D1=85=20=D1=82=D0=BE=D0=BD=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F=D0=BC=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5=20?= =?UTF-8?q?Box"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 036f9593177fb8c966e0c3fb645b248024aec573. --- code/_globalvars/lists/maintenance_loot.dm | 2 -- maps/boxstation/boxstation.dmm | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index c4c336080f98..68ec8f8611f9 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -162,8 +162,6 @@ var/global/list/uncommon_loot = list( /obj/item/clothing/mask/muzzle = 1, /obj/item/clothing/ears/earmuffs = 1, /obj/item/clothing/gloves/black = 1, - /obj/item/clothing/gloves/insulated = 1, - /obj/item/clothing/glasses/sunglasses = 1, ) = 8, list( diff --git a/maps/boxstation/boxstation.dmm b/maps/boxstation/boxstation.dmm index b394b12fb6b6..f97d288d31c8 100644 --- a/maps/boxstation/boxstation.dmm +++ b/maps/boxstation/boxstation.dmm @@ -21799,6 +21799,7 @@ /turf/simulated/floor, /area/station/ai_monitored/eva) "aMG" = ( +/obj/item/clothing/gloves/insulated, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet, /turf/simulated/floor/plating, @@ -68314,6 +68315,7 @@ "cIQ" = ( /obj/structure/rack, /obj/item/clothing/mask/gas/coloured, +/obj/item/clothing/glasses/sunglasses, /obj/effect/decal/turf_decal/set_damaged, /turf/simulated/floor/plating, /area/station/maintenance/medbay) @@ -76089,6 +76091,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/medbay) "jMb" = ( +/obj/item/clothing/gloves/insulated, /obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/closet/crate, /turf/simulated/floor/plating, From c8c5642df7f9d5a7ce40f032ef76d2f28febb4ad Mon Sep 17 00:00:00 2001 From: Riverz1 Date: Tue, 23 Jul 2024 11:02:03 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D1=81=D0=BF=D1=80=D0=B0=D0=B9=D1=82=20=D0=BD=D0=B0=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B1=D0=B5,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B6=D0=B8=D0=B3=D0=B0=D0=BB=D0=BA=D0=B0=20=D1=81?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2=D0=BE=D1=81=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/objects/items/weapons/tools.dm | 9 +++++++++ icons/mob/inhands/items_lefthand.dmi | Bin 220634 -> 220635 bytes icons/mob/inhands/items_righthand.dmi | Bin 220192 -> 220194 bytes 3 files changed, 9 insertions(+) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 1a95cc6721fb..03836bf1c1bf 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -546,6 +546,15 @@ if(!istype(src, /obj/item/weapon/weldingtool/experimental/sindi)) STOP_PROCESSING(SSobj, src) return + +/obj/item/weapon/weldingtool/experimental/sindi/process() + ..() + if((get_fuel() < max_fuel) && (next_refuel_tick < world.time) && !active) + next_refuel_tick = world.time + 2.5 SECONDS + reagents.add_reagent("fuel", 1) + if(!active && (get_fuel() == max_fuel)) + STOP_PROCESSING(SSobj, src) + /* * Crowbar */ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 18940a6e36e2d1141926dfe055d4b6836faedc76..057c7ab0723e8131bc21bbb8f07d1f965bb3248b 100644 GIT binary patch delta 2310 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 delta 3454 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 From b00ef36ec05618030a85b9e1d28005da1979f18c Mon Sep 17 00:00:00 2001 From: Riverz1 Date: Tue, 23 Jul 2024 16:06:19 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20sindi=20=D0=B2=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=83=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/game/machinery/vending/other.dm | 2 +- code/game/objects/items/weapons/storage/uplink_kits.dm | 2 +- code/game/objects/items/weapons/tools.dm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vending/other.dm b/code/game/machinery/vending/other.dm index aafb6797dc9d..300f34c1b38b 100644 --- a/code/game/machinery/vending/other.dm +++ b/code/game/machinery/vending/other.dm @@ -44,7 +44,7 @@ ) syndie = list( /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate = 1, - /obj/item/weapon/weldingtool/experimental/sindi = 1, + /obj/item/weapon/weldingtool/experimental/syndicate_zippo = 1, ) prices = list( /obj/item/weapon/storage/fancy/cigarettes = 20, diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index e8f64cd22968..94c1ef048dba 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -433,7 +433,7 @@ name = "chemical fighter kit" startswith = list( /obj/item/weapon/reagent_containers/watertank_backpack/syndie, - /obj/item/weapon/weldingtool/experimental/sindi, + /obj/item/weapon/weldingtool/experimental/syndicate_zippo, /obj/item/weapon/gun/projectile/revolver/syndie, /obj/item/ammo_box/speedloader/a357 = 2, /obj/item/weapon/melee/energy/sword, diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 03836bf1c1bf..af23875883cd 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -515,16 +515,16 @@ if(!active && (get_fuel() == max_fuel)) STOP_PROCESSING(SSobj, src) -/obj/item/weapon/weldingtool/experimental/sindi +/obj/item/weapon/weldingtool/experimental/syndicate_zippo icon_state = "syndizippo" - name = "syndi zippo" + name = "syndicate zippo" desc = "A very cool zippo" icon = 'icons/obj/items.dmi' w_class = SIZE_MINUSCULE max_fuel = 150 next_refuel_tick = 0 -/obj/item/weapon/weldingtool/experimental/sindi/process() +/obj/item/weapon/weldingtool/experimental/syndicate_zippo/process() if(active) hitsound = SOUNDIN_LASERACT if(icon_state != "syndizippo1") // Check that the sprite is correct, if it isnt, it means toggle() was not called From 7854b64a2c214ea5f5cd76421f6d7c5b6691ca81 Mon Sep 17 00:00:00 2001 From: Riverz1 Date: Tue, 23 Jul 2024 18:09:54 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9D=D0=B5=20=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/datums/uplinks_items.dm | 6 +++--- code/game/objects/items/weapons/tools.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/uplinks_items.dm b/code/datums/uplinks_items.dm index 966e5c887d1a..a52e0887a304 100644 --- a/code/datums/uplinks_items.dm +++ b/code/datums/uplinks_items.dm @@ -1097,10 +1097,10 @@ item = /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate cost = 2 -/datum/uplink_item/badass/item/weapon/weldingtool/experimental/sindi +/datum/uplink_item/badass/item/weapon/weldingtool/experimental/syndicate_zippo name = "Syndicate Zippo" - desc = "A very cool zippo and welding" - item = /obj/item/weapon/weldingtool/experimental/sindi + desc = "A very cool zippo and welder" + item = /obj/item/weapon/weldingtool/experimental/syndicate_zippo cost = 4 /datum/uplink_item/badass/syndiedonuts diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index af23875883cd..68972cf349e7 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -543,11 +543,11 @@ icon_state = initial(icon_state) active = FALSE set_light(0) - if(!istype(src, /obj/item/weapon/weldingtool/experimental/sindi)) + if(!istype(src, /obj/item/weapon/weldingtool/experimental/syndicate_zippo)) STOP_PROCESSING(SSobj, src) return -/obj/item/weapon/weldingtool/experimental/sindi/process() +/obj/item/weapon/weldingtool/experimental/syndicate_zippo/process() ..() if((get_fuel() < max_fuel) && (next_refuel_tick < world.time) && !active) next_refuel_tick = world.time + 2.5 SECONDS