cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +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

46
code/_helpers/unsorted.dm
View File

@@ -308,8 +308,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
var/search_pda = 1
for(var/A in searching)
if( search_id && istype(A,/obj/item/weapon/card/id) )
var/obj/item/weapon/card/id/ID = A
if( search_id && istype(A,/obj/item/card/id) )
var/obj/item/card/id/ID = A
if(ID.registered_name == oldname)
ID.registered_name = newname
ID.name = "[newname]'s ID Card ([ID.assignment])"
@@ -812,12 +812,12 @@ proc/get_mob_with_client_list()
//Quick type checks for some tools
var/global/list/common_tools = list(
/obj/item/stack/cable_coil,
/obj/item/weapon/wrench,
/obj/item/weapon/weldingtool,
/obj/item/weapon/screwdriver,
/obj/item/weapon/wirecutters,
/obj/item/wrench,
/obj/item/weldingtool,
/obj/item/screwdriver,
/obj/item/wirecutters,
/obj/item/device/multitool,
/obj/item/weapon/crowbar)
/obj/item/crowbar)
/proc/istool(O)
if(O && is_type_in_list(O, common_tools))
@@ -826,18 +826,18 @@ var/global/list/common_tools = list(
proc/is_hot(obj/item/W as obj)
switch(W.type)
if(/obj/item/weapon/weldingtool)
var/obj/item/weapon/weldingtool/WT = W
if(/obj/item/weldingtool)
var/obj/item/weldingtool/WT = W
if(WT.isOn())
return 3800
else
return 0
if(/obj/item/weapon/flame/lighter)
if(/obj/item/flame/lighter)
if(W:lit)
return 1500
else
return 0
if(/obj/item/weapon/flame/match)
if(/obj/item/flame/match)
if(W:lit)
return 1000
else
@@ -847,9 +847,9 @@ proc/is_hot(obj/item/W as obj)
return 1000
else
return 0
if(/obj/item/weapon/gun/energy/plasmacutter)
if(/obj/item/gun/energy/plasmacutter)
return 3800
if(/obj/item/weapon/melee/energy)
if(/obj/item/melee/energy)
return 3500
else
return 0
@@ -878,20 +878,20 @@ proc/is_hot(obj/item/W as obj)
W.isscrewdriver() || \
W.ispen() || \
W.iswelder() || \
istype(W, /obj/item/weapon/flame/lighter/zippo) || \
istype(W, /obj/item/weapon/flame/match) || \
istype(W, /obj/item/flame/lighter/zippo) || \
istype(W, /obj/item/flame/match) || \
istype(W, /obj/item/clothing/mask/smokable/cigarette) || \
istype(W, /obj/item/weapon/shovel) \
istype(W, /obj/item/shovel) \
)
/proc/is_surgery_tool(obj/item/W as obj)
return ( \
istype(W, /obj/item/weapon/scalpel) || \
istype(W, /obj/item/weapon/hemostat) || \
istype(W, /obj/item/weapon/retractor) || \
istype(W, /obj/item/weapon/cautery) || \
istype(W, /obj/item/weapon/bonegel) || \
istype(W, /obj/item/weapon/bonesetter)
istype(W, /obj/item/scalpel) || \
istype(W, /obj/item/hemostat) || \
istype(W, /obj/item/retractor) || \
istype(W, /obj/item/cautery) || \
istype(W, /obj/item/bonegel) || \
istype(W, /obj/item/bonesetter)
)
/proc/is_borg_item(obj/item/W as obj)
@@ -940,7 +940,7 @@ var/list/wall_items = typecacheof(list(
/obj/structure/noticeboard,
/obj/machinery/computer/security/telescreen,
/obj/machinery/embedded_controller/radio/airlock,
/obj/item/weapon/storage/secure/safe,
/obj/item/storage/secure/safe,
/obj/machinery/door_timer,
/obj/machinery/flasher,
/obj/machinery/keycard_auth,