diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm index 1667d7d2d5d..e766467820f 100644 --- a/code/ATMOSPHERICS/components/unary/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm @@ -245,7 +245,7 @@ attackby(obj/item/W, mob/user) if(istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (W:remove_fuel(2,user)) + if (W:remove_fuel(0,user)) user << "\blue Now welding the vent." if(do_after(user, 20)) playsound(src.loc, 'Welder2.ogg', 50, 1) diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 97df3ae6bb0..bc81ac39587 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2557,6 +2557,14 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( origin_tech = "materials=6" desc = "This makes perfect sense." + plasmacutter + name = "Plasma Cutter" + icon_state = "plasmacutter" + icon_state = "gun" + digspeed = 0 + origin_tech = "materials=6, plasma=3" + desc = "You could use it to cut limbs off of xenos! Or, you know, mine stuff." + /*****************************Shovel********************************/ /obj/item/weapon/shovel diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 8b067609b21..c33cf7cdd52 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -254,6 +254,7 @@ var/global/list/autolathe_recipes_hidden = list( \ new /obj/item/device/timer(), \ new /obj/item/weapon/rcd(), \ new /obj/item/device/infra(), \ + new /obj/item/weapon/weldingtool/largetank(), \ new /obj/item/device/infra_sensor(), \ new /obj/item/weapon/handcuffs(), \ new /obj/item/weapon/ammo/a357(), \ diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 9401b015f68..373ddcf665c 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -806,7 +806,7 @@ Auto Patrol: []"}, src.icon_state = "ed209_shell" del(W) else if ((istype(W, /obj/item/weapon/weldingtool) && W:welding) && (src.build_step == 3)) - if (W:remove_fuel(1,user)) + if (W:remove_fuel(0,user)) src.build_step++ src.name = "shielded frame assembly" user << "You welded the vest to [src]!" diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 416d1d574d7..06e9b644c91 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -847,7 +847,7 @@ return else if(istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (W:remove_fuel(1,user)) + if (W:remove_fuel(0,user)) if (src.internal_damage & MECHA_INT_TANK_BREACH) src.internal_damage &= ~MECHA_INT_TANK_BREACH user << "\blue You repair the damaged gas tank." diff --git a/code/game/mecha/mecha_construction.dm b/code/game/mecha/mecha_construction.dm index 0bcfe460b27..742c7e43554 100644 --- a/code/game/mecha/mecha_construction.dm +++ b/code/game/mecha/mecha_construction.dm @@ -351,7 +351,7 @@ /datum/construction/mecha/custom_action(step, atom/used_atom, mob/user) if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom - if (W:remove_fuel(2, user)) + if (W:remove_fuel(0, user)) playsound(holder, 'Welder2.ogg', 50, 1) else return 0 @@ -380,7 +380,7 @@ /datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user as mob) if(istype(used_atom, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = used_atom - if (W:remove_fuel(2, user)) + if (W:remove_fuel(0, user)) playsound(holder, 'Welder2.ogg', 50, 1) else return 0 diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 927f5718145..41e742fe923 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -27,7 +27,7 @@ if(salvage_num <= 0) user << "You can't see anything of value left on this wreck." return - if (W:remove_fuel(1,user)) + if (W:remove_fuel(0,user)) var/type = prob(70)?pick(welder_salvage):null if(type) var/N = new type(get_turf(user)) diff --git a/code/game/objects/closets/secure/engineering.dm b/code/game/objects/closets/secure/engineering.dm index 23ec5fb342a..b5ac0556fb6 100644 --- a/code/game/objects/closets/secure/engineering.dm +++ b/code/game/objects/closets/secure/engineering.dm @@ -39,9 +39,9 @@ new /obj/item/clothing/head/helmet/welding( src ) new /obj/item/clothing/head/helmet/welding( src ) new /obj/item/clothing/head/helmet/welding( src ) - new /obj/item/weapon/weldingtool( src ) - new /obj/item/weapon/weldingtool( src ) - new /obj/item/weapon/weldingtool( src ) + new /obj/item/weapon/weldingtool/largetank( src ) + new /obj/item/weapon/weldingtool/largetank( src ) + new /obj/item/weapon/weldingtool/largetank( src ) return /obj/secure_closet/engineering_personal/New() diff --git a/code/game/objects/door_assembly.dm b/code/game/objects/door_assembly.dm index 38b0adab54c..2d0a1fc02c7 100644 --- a/code/game/objects/door_assembly.dm +++ b/code/game/objects/door_assembly.dm @@ -84,7 +84,7 @@ obj/door_assembly /obj/door_assembly/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/weldingtool) && W:welding && !anchored ) - if (W:remove_fuel(1,user)) + if (W:remove_fuel(0,user)) user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.") playsound(src.loc, 'Welder2.ogg', 50, 1) if(do_after(user, 40)) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 989df9a8f44..ba50ec97271 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -82,7 +82,7 @@ WELDINGTOOOL // WELDING TOOL /obj/item/weapon/weldingtool - name = "weldingtool" + name = "Welding Tool" icon = 'items.dmi' icon_state = "welder" flags = FPRINT | TABLEPASS| CONDUCT @@ -304,7 +304,20 @@ WELDINGTOOOL /obj/item/weapon/weldingtool/largetank - name = "weldingtool" - icon = 'items.dmi' - icon_state = "welder" - max_fuel = 40 \ No newline at end of file + name = "Industrial Welding Tool" + max_fuel = 40 + m_amt = 70 + g_amt = 60 +/obj/item/weapon/weldingtool/hugetank + name = "Upgraded Welding Tool" + max_fuel = 80 + w_class = 3.0 + m_amt = 70 + g_amt = 120 + +/obj/item/weapon/weldingtool/experimental + name = "Experimental Welding Tool" + max_fuel = 80 + w_class = 3.0 + m_amt = 70 + g_amt = 120 \ No newline at end of file diff --git a/code/game/turf.dm b/code/game/turf.dm index 77397d4e016..15ca5aed840 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -346,7 +346,7 @@ F.sd_LumReset() return - if (W:remove_fuel(5,user)) + if (W:remove_fuel(0,user)) user << "\blue Now disassembling the outer wall plating." playsound(src.loc, 'Welder.ogg', 100, 1) sleep(100) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 23baebd00e7..1b43000b076 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -375,12 +375,10 @@ src.icon_state = "monkey0" if (src.wear_mask) - if (istype(src.wear_mask, /obj/item/clothing/mask) && src.update_icon) - var/t1 = src.wear_mask.item_state - if (!( t1 )) - t1 = src.wear_mask.icon_state - src.overlays += image("icon" = 'monkey.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = src.layer) - src.wear_mask.screen_loc = ui_mask + if (istype(src.wear_mask, /obj/item/clothing/mask)) + var/t1 = src.wear_mask.icon_state + src.overlays += image("icon" = 'monkey.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = MOB_LAYER) + src.wear_mask.screen_loc = ui_mask if (src.r_hand) if(src.update_icon) @@ -393,11 +391,8 @@ src.l_hand.screen_loc = ui_lhand if (src.back) - if(src.update_icon) - if (!( src.lying )) - src.overlays += image("icon" = 'monkey.dmi', "icon_state" = "back", "layer" = src.layer) - else - src.overlays += image("icon" = 'monkey.dmi', "icon_state" = "back2", "layer" = src.layer) + var/t1 = src.back.icon_state //this will fix the back packs not working. Yay! Now I can delete all those monkey backpack sprites + src.overlays += image("icon" = 'back.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = MOB_LAYER) src.back.screen_loc = ui_back if (src.handcuffed && src.update_icon) diff --git a/code/modules/mob/living/silicon/hivebot/hivebot.dm b/code/modules/mob/living/silicon/hivebot/hivebot.dm index 11111ea9205..01d9a9bed65 100644 --- a/code/modules/mob/living/silicon/hivebot/hivebot.dm +++ b/code/modules/mob/living/silicon/hivebot/hivebot.dm @@ -185,7 +185,7 @@ /mob/living/silicon/hivebot/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (W:remove_fuel(4)) + if (W:remove_fuel(0)) src.bruteloss -= 30 if(src.bruteloss < 0) src.bruteloss = 0 src.updatehealth() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 1a5c5c08057..ffcb9b30eb0 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -371,7 +371,7 @@ /mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/weldingtool) && W:welding) - if (W:remove_fuel(4)) + if (W:remove_fuel(0)) src.bruteloss -= 30 if(src.bruteloss < 0) src.bruteloss = 0 src.updatehealth() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index d2707fe62a3..909a8adc9cf 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -144,7 +144,7 @@ user << "\red The [src.name] needs to be wrenched to the floor." return if(1) - if (W:remove_fuel(2,user)) + if (W:remove_fuel(0,user)) playsound(src.loc, 'Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ "You start to weld the [src] to the floor.", \ @@ -156,7 +156,7 @@ user << "\blue You need more welding fuel to complete this task." return if(2) - if (W:remove_fuel(2,user)) + if (W:remove_fuel(0,user)) playsound(src.loc, 'Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ "You start to cut the [src] free from the floor.", \ diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 22e60d1f34b..09b99e4c62a 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -108,7 +108,7 @@ user << "\red The [src.name] needs to be wrenched to the floor." return if(1) - if (W:remove_fuel(2,user)) + if (W:remove_fuel(0,user)) playsound(src.loc, 'Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \ "You start to weld the [src] to the floor.", \ @@ -119,7 +119,7 @@ else return if(2) - if (W:remove_fuel(2,user)) + if (W:remove_fuel(0,user)) playsound(src.loc, 'Welder2.ogg', 50, 1) user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \ "You start to cut the [src] free from the floor.", \ diff --git a/config/admins.txt b/config/admins.txt index 2989e68b087..c8dded0bf5c 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -1,6 +1 @@ -deuryn - Host - -tle - Host -neofite - Host - -mport2004 - Coder \ No newline at end of file +Themicrowave - Host \ No newline at end of file diff --git a/data/mode.txt b/data/mode.txt index bd81a61cbfd..cf1ffd5c991 100644 --- a/data/mode.txt +++ b/data/mode.txt @@ -1 +1 @@ -traitor +extended \ No newline at end of file diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index 382bb05d430..affcdc8c3f0 100644 Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi index ae3bc9a59b3..f099d11b5c3 100644 Binary files a/icons/mob/monkey.dmi and b/icons/mob/monkey.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 571df37f834..9f129ba9e4e 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ