cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +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/multiz/mobile_ladders.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/obj/item/weapon/ladder_mobile
/obj/item/ladder_mobile
name = "mobile ladder"
desc = "A lightweight deployable ladder, which you can use to move up or down. Or alternatively, you can bash some faces in."
icon_state = "mobile_ladder"
@@ -10,7 +10,7 @@
w_class = 4.0
slot_flags = SLOT_BACK
/obj/item/weapon/ladder_mobile/proc/place_ladder(atom/A, mob/user)
/obj/item/ladder_mobile/proc/place_ladder(atom/A, mob/user)
if (isopenturf(A)) //Place into open space
var/turf/below_loc = GetBelow(A)
@@ -49,13 +49,13 @@
user.drop_from_inventory(src,get_turf(src))
qdel(src)
/obj/item/weapon/ladder_mobile/afterattack(atom/A, mob/user,proximity)
/obj/item/ladder_mobile/afterattack(atom/A, mob/user,proximity)
if (!proximity)
return
place_ladder(A,user)
/obj/item/weapon/ladder_mobile/proc/handle_action(atom/A, mob/user)
/obj/item/ladder_mobile/proc/handle_action(atom/A, mob/user)
if (!do_after(user, 30, act_target = user))
to_chat(user, "Can't place ladder! You were interrupted!")
return FALSE
@@ -87,7 +87,7 @@
if (QDELETED(src))
return
var/obj/item/weapon/ladder_mobile/R = new(get_turf(H))
var/obj/item/ladder_mobile/R = new(get_turf(H))
transfer_fingerprints_to(R)
H.visible_message("<span class='notice'>[H] folds [src] up into [R]!</span>",
code/modules/multiz/movement.dm
+5 -5
View File
@@ -234,7 +234,7 @@
// they can have them. So we override and check.
/mob/living/carbon/human/CanAvoidGravity()
if (!restrained())
var/obj/item/weapon/tank/jetpack/thrust = GetJetpack(src)
var/obj/item/tank/jetpack/thrust = GetJetpack(src)
if (thrust && !lying && thrust.allow_thrust(0.01, src))
return TRUE
@@ -242,7 +242,7 @@
return ..()
/mob/living/silicon/robot/CanAvoidGravity()
var/obj/item/weapon/tank/jetpack/thrust = GetJetpack(src)
var/obj/item/tank/jetpack/thrust = GetJetpack(src)
if (thrust && thrust.allow_thrust(0.02, src))
return TRUE
@@ -327,7 +327,7 @@
/mob/living/carbon/human/can_fall(turf/below, turf/simulated/open/dest = src.loc)
// Special condition for jetpack mounted folk!
if (!restrained())
var/obj/item/weapon/tank/jetpack/thrust = GetJetpack(src)
var/obj/item/tank/jetpack/thrust = GetJetpack(src)
if (thrust && thrust.stabilization_on &&\
!lying && thrust.allow_thrust(0.01, src))
@@ -342,7 +342,7 @@
return FALSE
/mob/living/silicon/robot/can_fall(turf/below, turf/simulated/open/dest = src.loc)
var/obj/item/weapon/tank/jetpack/thrust = GetJetpack(src)
var/obj/item/tank/jetpack/thrust = GetJetpack(src)
if (thrust && thrust.stabilization_on && thrust.allow_thrust(0.02, src))
return FALSE
@@ -434,7 +434,7 @@
if (istype(loc, /turf/space) || (area && !area.has_gravity()))
return FALSE
var/obj/item/weapon/rig/rig = get_rig()
var/obj/item/rig/rig = get_rig()
if (istype(rig))
for (var/obj/item/rig_module/actuators/A in rig.installed_modules)
if (A.active && rig.check_power_cost(src, 10, A, 0))
code/modules/multiz/structures.dm
+2 -2
View File
@@ -56,7 +56,7 @@
if(!target_ladder)
return
var/obj/item/weapon/grab/G = M.l_hand
var/obj/item/grab/G = M.l_hand
if (!istype(G))
G = M.r_hand
@@ -147,7 +147,7 @@
return FALSE
playsound(src, pick(climbsounds), 50)
playsound(target_ladder, pick(climbsounds), 50)
var/obj/item/weapon/grab/G = M.l_hand
var/obj/item/grab/G = M.l_hand
if (!istype(G))
G = M.r_hand
if (istype(G))