cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution

Browse Source
This commit is contained in:
Heroman3003
2022-10-29 17:12:57 +10:00
committed by GitHub
parent eba08a1c71
commit a206544f98
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/construction.dm
-4
View File
@@ -39,12 +39,8 @@
icon_state = "quad-frame"
pixel_x = -16
<<<<<<< HEAD
/obj/item/weapon/vehicle_assembly/quadbike/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
..()
=======
/obj/item/vehicle_assembly/quadbike/attackby(var/obj/item/W as obj, var/mob/user as mob)
>>>>>>> 62b57acf8cc... Snowmobiles and Quadhancements V2 (#8776)
switch(build_stage)
if(0)