cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01: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
code/modules/customitems/item_spawning.dm
+4 -4
View File
@@ -84,8 +84,8 @@
kit.new_mob_icon_file = CUSTOM_ITEM_MOB
// for snowflake implants
else if(istype(item, /obj/item/weapon/implanter/fluff))
var/obj/item/weapon/implanter/fluff/L = item
else if(istype(item, /obj/item/implanter/fluff))
var/obj/item/implanter/fluff/L = item
L.allowed_ckey = assoc_key
L.implant_type = text2path(additional_data)
L.create_implant()
@@ -224,8 +224,8 @@
// ID cards and PDAs are applied directly to the existing object rather than spawned fresh.
var/obj/item/existing_item
if(citem.item_path == /obj/item/weapon/card/id)
existing_item = locate(/obj/item/weapon/card/id) in M.get_contents() //TODO: Improve this ?
if(citem.item_path == /obj/item/card/id)
existing_item = locate(/obj/item/card/id) in M.get_contents() //TODO: Improve this ?
else if(citem.item_path == /obj/item/device/pda)
existing_item = locate(/obj/item/device/pda) in M.contents