cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* Adds icon and hitsound where needed.

* Moves alt_attack to /obj/item and deletes weapons.dm

* Replaced /obj/item/weapon with /obj/item

* Fixes merge issues.

* Fix merge issues.
This commit is contained in:
Werner
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/game/objects/structures/crates_lockers/crates.dm
View File

@@ -88,7 +88,7 @@
/obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob)
if(opened)
return ..()
else if(istype(W, /obj/item/stack/packageWrap))
@@ -333,10 +333,10 @@
else
return toggle(user)
/obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters)))
/obj/structure/closet/crate/secure/attackby(obj/item/W as obj, mob/user as mob)
if(is_type_in_list(W, list(/obj/item/stack/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/wirecutters)))
return ..()
if(istype(W, /obj/item/weapon/melee/energy/blade))
if(istype(W, /obj/item/melee/energy/blade))
emag_act(INFINITY, user)
if(!opened)
togglelock(user)
@@ -430,10 +430,10 @@
icon_closed = "crate"
/obj/structure/closet/crate/rfd/fill()
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd_ammo(src)
new /obj/item/weapon/rfd/construction(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd_ammo(src)
new /obj/item/rfd/construction(src)
/obj/structure/closet/crate/solar
name = "solar pack crate"
@@ -460,9 +460,9 @@
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/solar_assembly(src)
new /obj/item/weapon/circuitboard/solar_control(src)
new /obj/item/weapon/tracker_electronics(src)
new /obj/item/weapon/paper/solar(src)
new /obj/item/circuitboard/solar_control(src)
new /obj/item/tracker_electronics(src)
new /obj/item/paper/solar(src)
/obj/structure/closet/crate/freezer
name = "freezer"
@@ -492,8 +492,8 @@
/obj/structure/closet/crate/freezer/rations/fill()
for(var/i=1,i<=6,i++)
new /obj/item/weapon/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle(src)
new /obj/item/reagent_containers/food/snacks/liquidfood(src)
new /obj/item/reagent_containers/food/drinks/cans/waterbottle(src)
/obj/structure/closet/crate/bin
name = "large bin"
@@ -632,14 +632,14 @@
//This exists so the prespawned hydro crates spawn with their contents.
fill()
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
new /obj/item/weapon/material/minihoe(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/weedspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/reagent_containers/spray/plantbgone(src)
new /obj/item/material/minihoe(src)
// new /obj/item/weedspray(src)
// new /obj/item/weedspray(src)
// new /obj/item/pestspray(src)
// new /obj/item/pestspray(src)
// new /obj/item/pestspray(src)
@@ -705,7 +705,7 @@
/obj/structure/closet/crate/extinguisher_cartridges/fill()
for(var/a = 1 to 12)
new /obj/item/weapon/reagent_containers/extinguisher_refill(src)
new /obj/item/reagent_containers/extinguisher_refill(src)
/obj/structure/closet/crate/autakh
name = "aut'akh crate"