cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 12:13:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-12029

Browse Source
This commit is contained in:
Nadyr
2022-01-09 20:18:25 -05:00
committed by GitHub
parent a84c109a45 0f2cb543eb
commit 97e80df2a7
12 changed files with 273 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+1 -5
View File
@@ -159,16 +159,12 @@
/obj/item/weapon/cell, //this is a bigger belt, might as well make it hold bigger cells too
/obj/item/weapon/pipe_dispenser, //bigger belt for bigger tools
/obj/item/weapon/rcd, //see above
<<<<<<< HEAD
/obj/item/device/quantum_pad_booster
=======
/obj/item/device/quantum_pad_booster,
/obj/item/weapon/inducer,
/obj/item/stack/material/steel,
/obj/item/stack/material/glass,
/obj/item/device/lightreplacer,
/obj/item/weapon/pickaxe/plasmacutter
>>>>>>> 22a34d927bf... Merge pull request #12029 from PastelPrinceDan/beltstufftake2
)
@@ -533,4 +529,4 @@
name = "ranger belt"
desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear."
icon = 'icons/obj/clothing/ranger.dmi'
icon_state = "ranger_belt"
icon_state = "ranger_belt"