cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes a bunch of things fit in holsters

Browse Source
This commit is contained in:
Anewbe
2017-10-07 17:21:01 -05:00
parent bd8c6d7cbf
commit ff7c4fe45a
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/defines/obj/weapon.dm
View File

@@ -31,6 +31,7 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "soap" icon_state = "soap"
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
slot_flags = SLOT_HOLSTER
throwforce = 0 throwforce = 0
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
@@ -58,6 +59,7 @@
item_state = "bike_horn" item_state = "bike_horn"
throwforce = 3 throwforce = 3
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
slot_flags = SLOT_HOLSTER
throw_speed = 3 throw_speed = 3
throw_range = 15 throw_range = 15
attack_verb = list("HONKED") attack_verb = list("HONKED")

5
code/game/objects/items/toys.dm
View File

@@ -141,6 +141,7 @@
icon_l_hand = 'icons/mob/items/lefthand_guns.dmi', icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi', icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
) )
slot_flags = SLOT_HOLSTER
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
attack_verb = list("attacked", "struck", "hit") attack_verb = list("attacked", "struck", "hit")
var/bullets = 5 var/bullets = 5
@@ -343,7 +344,7 @@
icon_state = "sunflower" icon_state = "sunflower"
item_state = "sunflower" item_state = "sunflower"
var/empty = 0 var/empty = 0
flags slot_flags = SLOT_HOLSTER
/obj/item/toy/waterflower/New() /obj/item/toy/waterflower/New()
var/datum/reagents/R = new/datum/reagents(10) var/datum/reagents/R = new/datum/reagents(10)
@@ -412,7 +413,7 @@
icon_state = "bosunwhistle" icon_state = "bosunwhistle"
var/cooldown = 0 var/cooldown = 0
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
slot_flags = SLOT_EARS slot_flags = SLOT_EARS | SLOT_HOLSTER
/obj/item/toy/bosunwhistle/attack_self(mob/user as mob) /obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
if(cooldown < world.time - 35) if(cooldown < world.time - 35)

1
code/modules/paperwork/stamps.dm
View File

@@ -6,6 +6,7 @@
item_state = "stamp" item_state = "stamp"
throwforce = 0 throwforce = 0
w_class = ITEMSIZE_TINY w_class = ITEMSIZE_TINY
slot_flags = SLOT_HOLSTER
throw_speed = 7 throw_speed = 7
throw_range = 15 throw_range = 15
matter = list(DEFAULT_WALL_MATERIAL = 60) matter = list(DEFAULT_WALL_MATERIAL = 60)

3
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -36,7 +36,7 @@
item_state = "crossbow" item_state = "crossbow"
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5) origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
matter = list(DEFAULT_WALL_MATERIAL = 2000) matter = list(DEFAULT_WALL_MATERIAL = 2000)
slot_flags = SLOT_BELT slot_flags = SLOT_BELT | SLOT_HOLSTER
silenced = 1 silenced = 1
fire_sound = 'sound/weapons/Genhit.ogg' fire_sound = 'sound/weapons/Genhit.ogg'
projectile_type = /obj/item/projectile/energy/bolt projectile_type = /obj/item/projectile/energy/bolt
@@ -54,6 +54,7 @@
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
force = 10 force = 10
matter = list(DEFAULT_WALL_MATERIAL = 200000) matter = list(DEFAULT_WALL_MATERIAL = 200000)
slot_flags = SLOT_BELT
projectile_type = /obj/item/projectile/energy/bolt/large projectile_type = /obj/item/projectile/energy/bolt/large
/obj/item/weapon/gun/energy/plasmastun /obj/item/weapon/gun/energy/plasmastun