cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +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/organs/blood.dm
+2 -2
View File
@@ -158,7 +158,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
****************************************************/
//Gets blood from mob to the container, preserving all data in it.
/mob/living/carbon/proc/take_blood(obj/item/weapon/reagent_containers/container, var/amount)
/mob/living/carbon/proc/take_blood(obj/item/reagent_containers/container, var/amount)
var/datum/reagent/B = get_blood(container.reagents)
if(!B) B = new /datum/reagent/blood
@@ -194,7 +194,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
return B
//For humans, blood does not appear from blue, it comes from vessels.
/mob/living/carbon/human/take_blood(obj/item/weapon/reagent_containers/container, var/amount)
/mob/living/carbon/human/take_blood(obj/item/reagent_containers/container, var/amount)
if(species && species.flags & NO_BLOOD)
return null
code/modules/organs/organ.dm
+2 -2
View File
@@ -134,7 +134,7 @@
// Don't process if we're in a freezer, an MMI or a stasis bag.or a freezer or something I dunno
if(istype(loc,/obj/item/device/mmi))
return
if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/weapon/storage/box/freezer))
if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/freezer))
return
//Process infections
if ((status & ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT)))
@@ -403,7 +403,7 @@
return
user.drop_from_inventory(src)
var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src))
var/obj/item/reagent_containers/food/snacks/organ/O = new(get_turf(src))
O.name = name
O.appearance = src
reagents.trans_to(O, reagents.total_volume)
code/modules/organs/organ_external.dm
+8 -8
View File
@@ -111,20 +111,20 @@
to_chat(usr, "<span class='danger'>There is \a [I] sticking out of it.</span>")
return
/obj/item/organ/external/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/organ/external/attackby(obj/item/W as obj, mob/user as mob)
switch(stage)
if(0)
if(istype(W,/obj/item/weapon/scalpel))
if(istype(W,/obj/item/scalpel))
user.visible_message("<span class='danger'><b>[user]</b> cuts [src] open with [W]!</span>")
stage++
return
if(1)
if(istype(W,/obj/item/weapon/retractor))
if(istype(W,/obj/item/retractor))
user.visible_message("<span class='danger'><b>[user]</b> cracks [src] open like an egg with [W]!</span>")
stage++
return
if(2)
if(istype(W,/obj/item/weapon/hemostat))
if(istype(W,/obj/item/hemostat))
if(contents.len)
var/obj/item/removing = pick(contents)
removing.forceMove(get_turf(user.loc))
@@ -388,7 +388,7 @@ This function completely restores a damaged organ to perfect condition.
// remove embedded objects and drop them on the floor
for(var/obj/implanted_object in implants)
if(!istype(implanted_object,/obj/item/weapon/implant)) // We don't want to remove REAL implants. Just shrapnel etc.
if(!istype(implanted_object,/obj/item/implant)) // We don't want to remove REAL implants. Just shrapnel etc.
implanted_object.forceMove(owner.loc)
implants -= implanted_object
@@ -506,8 +506,8 @@ This function completely restores a damaged organ to perfect condition.
if((status & ORGAN_BROKEN) && !(status & ORGAN_SPLINTED))
if(istype(owner,/mob/living/carbon/human))
var/mob/living/carbon/human/H = owner
if(H.back && istype(H.back, /obj/item/weapon/rig))
var/obj/item/weapon/rig/R = H.back
if(H.back && istype(H.back, /obj/item/rig))
var/obj/item/rig/R = H.back
if(R.offline)
return
if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
@@ -1025,7 +1025,7 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_malfunctioning()
return ((status & ORGAN_ROBOT) && (brute_dam + burn_dam) >= 10 && prob(brute_dam + burn_dam))
/obj/item/organ/external/proc/embed(var/obj/item/weapon/W, var/silent = 0, var/supplied_message)
/obj/item/organ/external/proc/embed(var/obj/item/W, var/silent = 0, var/supplied_message)
if(!owner || loc != owner)
return
if(species.flags & NO_EMBED)
code/modules/organs/subtypes/autakh.dm
+10 -10
View File
@@ -291,7 +291,7 @@
/obj/item/organ/external/hand/right/autakh/tool
name = "engineering grasper"
action_button_name = "Deploy Mechanical Combitool"
var/augment_type = /obj/item/weapon/combitool/robotic
var/augment_type = /obj/item/combitool/robotic
/obj/item/organ/external/hand/right/autakh/tool/refresh_action_button()
. = ..()
@@ -329,22 +329,22 @@
owner.put_in_active_hand(M)
owner.visible_message("<span class='notice'>\The [M] slides out of \the [owner]'s [src].</span>","<span class='notice'>You deploy \the [M]!</span>")
/obj/item/weapon/combitool/robotic
/obj/item/combitool/robotic
name = "robotic combitool"
desc = "An integrated combitool module."
icon_state = "digitool"
/obj/item/weapon/combitool/robotic/throw_at()
/obj/item/combitool/robotic/throw_at()
usr.drop_from_inventory(src)
/obj/item/weapon/combitool/robotic/dropped()
/obj/item/combitool/robotic/dropped()
loc = null
qdel(src)
/obj/item/organ/external/hand/right/autakh/tool/mining
name = "mining grasper"
action_button_name = "Deploy Mounted Drill"
augment_type = /obj/item/weapon/pickaxe/drill/integrated
augment_type = /obj/item/pickaxe/drill/integrated
/obj/item/organ/external/hand/right/autakh/mining/refresh_action_button()
. = ..()
@@ -353,15 +353,15 @@
if(action.button)
action.button.UpdateIcon()
/obj/item/weapon/pickaxe/drill/integrated
/obj/item/pickaxe/drill/integrated
name = "integrated mining drill"
icon_state = "integrateddrill"
item_state = "integrateddrill"
/obj/item/weapon/pickaxe/drill/integrated/throw_at()
/obj/item/pickaxe/drill/integrated/throw_at()
usr.drop_from_inventory(src)
/obj/item/weapon/pickaxe/drill/integrated/dropped()
/obj/item/pickaxe/drill/integrated/dropped()
loc = null
qdel(src)
@@ -396,7 +396,7 @@
if(is_bruised())
spark(get_turf(owner), 3)
var/obj/item/weapon/grab/G = owner.get_active_hand()
var/obj/item/grab/G = owner.get_active_hand()
if(!istype(G))
to_chat(owner, "<span class='danger'>You must grab someone before trying to analyze their health!</span>")
return
@@ -437,7 +437,7 @@
if(is_bruised())
spark(get_turf(owner), 3)
var/obj/item/weapon/grab/G = owner.get_active_hand()
var/obj/item/grab/G = owner.get_active_hand()
if(!istype(G))
to_chat(owner, "<span class='danger'>You must grab someone before trying to use your [src]!</span>")
return
code/modules/organs/subtypes/vaurca.dm
+2 -2
View File
@@ -161,7 +161,7 @@ obj/item/organ/vaurca/neuralsocket/process()
descriptive = "cold"
to_chat(user, "<span class='notice'>\The [src] feels [descriptive].</span>")
/obj/item/organ/vaurca/preserve/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/item/organ/vaurca/preserve/attackby(obj/item/W as obj, mob/user as mob)
..()
var/obj/icon = src
@@ -218,7 +218,7 @@ obj/item/organ/vaurca/neuralsocket/process()
else if(src in location) // or if tank is in the mobs possession
if(!location.internal) // and they do not have any active internals
mask_check = 1
else if(istype(src.loc, /obj/item/weapon/rig) && src.loc in location) // or the rig is in the mobs possession
else if(istype(src.loc, /obj/item/rig) && src.loc in location) // or the rig is in the mobs possession
if(!location.internal) // and they do not have any active internals
mask_check = 1