cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-10 15:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes dorms toolboxes, tool storage insuls and multitools. (#48856)

Browse Source 
* Replaces tool storage insulated gloves with budgets.

* Removes multitools, dorms toolboxes

* Adds multitools to youtool premium
This commit is contained in:
skoglol
2020-01-29 00:06:58 +01:00
committed by GitHub
parent 03c5e7ecc2
commit 398bbdbbec
8 changed files with 23 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+1 -17
View File
@@ -11835,10 +11835,6 @@
/obj/item/radio/intercom{
pixel_y = 20
},
/obj/item/multitool,
/obj/item/multitool{
pixel_x = 4
},
/turf/open/floor/plasteel,
/area/storage/primary)
"aDo" = (
@@ -17870,14 +17866,6 @@
/obj/structure/table,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTA" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTB" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -17886,10 +17874,6 @@
/area/crew_quarters/locker)
"aTC" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
@@ -71418,7 +71402,7 @@ aOp
aPA
aQR
aQN
aTA
aTz
aUq
aWq
aXs
_maps/map_files/Deltastation/DeltaStation2.dmm
+1 -8
View File
@@ -46708,9 +46708,9 @@
/area/storage/primary)
"bKt" = (
/obj/structure/table/reinforced,
/obj/item/clothing/gloves/color/yellow,
/obj/item/storage/box/lights/mixed,
/obj/effect/turf_decal/bot,
/obj/item/clothing/gloves/color/fyellow,
/turf/open/floor/plasteel,
/area/storage/primary)
"bKu" = (
@@ -50214,8 +50214,6 @@
/obj/structure/table/reinforced,
/obj/item/assembly/timer,
/obj/item/assembly/timer,
/obj/item/multitool,
/obj/item/multitool,
/obj/machinery/light,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
@@ -70084,11 +70082,6 @@
/area/crew_quarters/locker)
"cAq" = (
/obj/structure/table,
/obj/item/storage/toolbox/mechanical{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/toolbox/emergency,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
_maps/map_files/Donutstation/Donutstation.dmm
-4
View File
@@ -20177,10 +20177,6 @@
/area/crew_quarters/kitchen)
"bdD" = (
/obj/structure/table,
/obj/item/multitool{
pixel_x = 6
},
/obj/item/multitool,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/effect/turf_decal/tile/brown{
_maps/map_files/KiloStation/KiloStation.dmm
+2 -8
View File
@@ -22771,7 +22771,6 @@
pixel_y = 4
},
/obj/item/storage/toolbox/electrical,
/obj/item/multitool,
/obj/machinery/light{
dir = 8
},
@@ -22779,7 +22778,6 @@
dir = 4;
pixel_x = -26
},
/obj/item/multitool,
/turf/open/floor/plasteel/dark,
/area/storage/primary)
"aKe" = (
@@ -57985,11 +57983,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/item/storage/toolbox/mechanical{
pixel_x = 2;
pixel_y = 4
},
/obj/item/storage/toolbox/emergency,
/obj/item/razor,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bJp" = (
@@ -72006,7 +72000,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/head/welding{
pixel_y = 4
},
@@ -72022,6 +72015,7 @@
network = list("ss13","engine")
},
/obj/structure/cable,
/obj/item/clothing/gloves/color/fyellow,
/turf/open/floor/plasteel/dark,
/area/storage/primary)
"cen" = (
_maps/map_files/MetaStation/MetaStation.dmm
+2 -14
View File
@@ -16688,10 +16688,6 @@
/obj/structure/table,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/multitool,
/obj/item/multitool{
pixel_x = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
@@ -18655,18 +18651,11 @@
/area/crew_quarters/locker)
"aPM" = (
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical{
pixel_x = -2;
pixel_y = -1
},
/obj/item/storage/toolbox/mechanical{
pixel_x = 4;
pixel_y = -4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aPN" = (
@@ -18977,12 +18966,12 @@
dir = 4;
pixel_x = 27
},
/obj/item/clothing/gloves/color/yellow,
/obj/item/t_scanner,
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/item/clothing/gloves/color/fyellow,
/turf/open/floor/plasteel,
/area/storage/primary)
"aQz" = (
@@ -19243,7 +19232,6 @@
"aRa" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/costume,
/obj/effect/spawner/lootdrop/costume,
/obj/item/clothing/mask/balaclava,
/obj/machinery/airalarm{
dir = 8;
_maps/map_files/PubbyStation/PubbyStation.dmm
-2
View File
@@ -11069,8 +11069,6 @@
/obj/structure/table,
/obj/item/assembly/signaler,
/obj/item/assembly/signaler,
/obj/item/multitool,
/obj/item/multitool,
/obj/machinery/airalarm{
pixel_y = 22
},
code/game/objects/items/devices/multitool.dm
+2 -1
View File
@@ -27,9 +27,10 @@
drop_sound = 'sound/items/handling/multitool_drop.ogg'
pickup_sound = 'sound/items/handling/multitool_pickup.ogg'
custom_materials = list(/datum/material/iron=50, /datum/material/glass=20)
var/obj/machinery/buffer // simple machine buffer for device linkage
custom_premium_price = 450
toolspeed = 1
usesound = 'sound/weapons/empty.ogg'
var/obj/machinery/buffer // simple machine buffer for device linkage
var/mode = 0
/obj/item/multitool/examine(mob/user)
code/modules/vending/youtool.dm
+15 -14
View File
@@ -4,22 +4,23 @@
icon_state = "tool"
icon_deny = "tool-deny"
products = list(/obj/item/stack/cable_coil = 10,
/obj/item/crowbar = 5,
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 5,
/obj/item/wrench = 5,
/obj/item/analyzer = 5,
/obj/item/t_scanner = 5,
/obj/item/screwdriver = 5,
/obj/item/flashlight/glowstick = 3,
/obj/item/flashlight/glowstick/red = 3,
/obj/item/flashlight = 5,
/obj/item/clothing/ears/earmuffs = 1)
/obj/item/crowbar = 5,
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 5,
/obj/item/wrench = 5,
/obj/item/analyzer = 5,
/obj/item/t_scanner = 5,
/obj/item/screwdriver = 5,
/obj/item/flashlight/glowstick = 3,
/obj/item/flashlight/glowstick/red = 3,
/obj/item/flashlight = 5,
/obj/item/clothing/ears/earmuffs = 1)
contraband = list(/obj/item/clothing/gloves/color/fyellow = 2)
premium = list(/obj/item/storage/belt/utility = 2,
/obj/item/weldingtool/hugetank = 2,
/obj/item/clothing/head/welding = 2,
/obj/item/clothing/gloves/color/yellow = 1)
/obj/item/multitool = 2,
/obj/item/weldingtool/hugetank = 2,
/obj/item/clothing/head/welding = 2,
/obj/item/clothing/gloves/color/yellow = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
default_price = 125