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

Merges the Janicart Floor Buffer into the Janiborg Floor Buffer (#25125)

Browse Source 
* One Floor Buffer For All!

* better name

* Update code/modules/research/designs/mechfabricator_designs.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-04-19 19:06:41 +01:00
committed by GitHub
parent 9cbec317e9
commit c8ffcedcb6
4 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/janitorial_designs.dm
-10
View File
@@ -21,16 +21,6 @@
build_path = /obj/item/storage/bag/trash/bluespace
category = list("Janitorial")
/datum/design/buffer
name = "Floor Buffer Upgrade"
desc = "A floor buffer that can be attached to vehicular janicarts."
id = "buffer"
req_tech = list("materials" = 4, "engineering" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL = 3000, MAT_GLASS = 200)
build_path = /obj/item/janiupgrade
category = list("Janitorial")
/datum/design/holosign
name = "Janitorial Holographic Sign Projector"
desc = "A holograpic projector used to project wet warning signs."
code/modules/research/designs/mechfabricator_designs.dm
+1 -1
View File
@@ -1125,7 +1125,7 @@
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/floorbuffer
req_tech = list("materials" = 4, "engineering" = 4)
materials = list(MAT_METAL=15000, MAT_GLASS=15000)
materials = list(MAT_METAL = 9000, MAT_GLASS = 7600)
construction_time = 12 SECONDS
category = list("Cyborg Upgrade Modules")
code/modules/vehicle/janivehicle.dm
+1 -8
View File
@@ -43,13 +43,6 @@
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
icon_state = "keyjanitor"
/obj/item/janiupgrade
name = "floor buffer upgrade"
desc = "An upgrade for mobile janicarts."
icon = 'icons/obj/vehicles.dmi'
icon_state = "upgrade"
origin_tech = "materials=3;engineering=4"
/datum/action/floor_buffer
name = "Toggle Floor Buffer"
desc = "Movement speed is decreased while active."
@@ -111,7 +104,7 @@
mybag = I
update_icon(UPDATE_OVERLAYS)
return
if(istype(I, /obj/item/janiupgrade))
if(istype(I, /obj/item/borg/upgrade/floorbuffer))
if(buffer_installed)
to_chat(user, fail_msg)
return