cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 23:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution

Browse Source
This commit is contained in:
Heroman3003
2022-10-29 17:15:09 +10:00
committed by GitHub
parent b0570b82c7
commit cfdb005dbc
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/quad.dm
-7
View File
@@ -88,16 +88,9 @@
if(8)
pixel_y = 0
<<<<<<< HEAD
/obj/vehicle/train/engine/quadbike/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/device/multitool) && open)
var/new_paint = input(usr, "Please select paint color.", "Paint Color", paint_color) as color|null
=======
/obj/vehicle/train/engine/quadbike/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/multitool) && open)
var/new_paint = input("Please select paint color.", "Paint Color", paint_color) as color|null
>>>>>>> 62b57acf8cc... Snowmobiles and Quadhancements V2 (#8776)
if(new_paint)
paint_color = new_paint
update_icon()