cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 12:35:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upsteam-12-15-25-revert-unique-reskins'

Browse Source 
# Conflicts:
#	_maps/bubber/automapper/templates/centcom/interlink_adminoffice.dmm
#	_maps/map_files/BoxStation/BoxStation.dmm
#	_maps/map_files/generic/CentCom_skyrat_z2.dmm
#	_maps/map_files/moonstation/moonstation.dmm
#	code/modules/holiday/holidays.dm
This commit is contained in:
nevimer
2026-01-12 22:09:10 -05:00
parent 0e35550270 a33fd49968
commit a9a59ed3f9
1118 changed files with 119008 additions and 36907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/caravanambush.dm
+2
View File
@@ -26,6 +26,8 @@
worn_icon_state = "cutters"
toolspeed = 0.3
random_color = FALSE
greyscale_config = null
greyscale_colors = null
/obj/item/crowbar/red/caravan
icon_state = "crowbar_caravan"