cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes All Weapons

Browse Source
This commit is contained in:
Fox McCloud
2018-04-15 16:25:56 -04:00
parent 8b576c4d42
commit 5c4aa9b3fd
1100 changed files with 17642 additions and 17666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/conveyor2.dm
+4 -4
View File
@@ -124,7 +124,7 @@
// attack with item, place item on conveyor
/obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
if(istype(I, /obj/item/crowbar))
if(!(stat & BROKEN))
var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
C.id = id
@@ -133,7 +133,7 @@
to_chat(usr,"<span class='notice'>You remove the conveyor belt.</span>")
qdel(src)
else if(istype(I, /obj/item/weapon/wrench))
else if(istype(I, /obj/item/wrench))
if(!(stat & BROKEN))
playsound(loc, I.usesound, 50, 1)
dir = turn(dir,-45)
@@ -294,7 +294,7 @@
CHECK_TICK
/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
if(istype(I, /obj/item/crowbar))
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
@@ -383,6 +383,6 @@
transfer_fingerprints_to(NC)
qdel(src)
/obj/item/weapon/paper/conveyor
/obj/item/paper/conveyor
name = "paper- 'Nano-it-up U-build series, #9: Build your very own conveyor belt, in SPACE'"
info = "<h1>Congratulations!</h1><p>You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!</p><p>Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see! </p><p> Set single directional switches by using your multitool on the switch after you've installed the switch assembly.</p><p> This convenience, you can only have it when you Nano-it-up. Stay nano!</p>"
code/modules/recycling/disposal-construction.dm
+3 -3
View File
@@ -175,7 +175,7 @@
to_chat(user, "You can only attach the [nicetype] if the floor plating is removed.")
return
if(istype(I, /obj/item/weapon/wrench))
if(istype(I, /obj/item/wrench))
if(anchored)
anchored = 0
if(ispipe)
@@ -215,9 +215,9 @@
to_chat(user, "There is already a [nicetype] at that location.")
return
if(istype(I, /obj/item/weapon/weldingtool))
if(istype(I, /obj/item/weldingtool))
if(anchored)
var/obj/item/weapon/weldingtool/W = I
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, W.usesound, 100, 1)
to_chat(user, "Welding the [nicetype] in place.")
code/modules/recycling/disposal.dm
+14 -14
View File
@@ -69,7 +69,7 @@
src.add_fingerprint(user)
if(mode<=0) // It's off
if(istype(I, /obj/item/weapon/screwdriver))
if(istype(I, /obj/item/screwdriver))
if(contents.len > 0)
to_chat(user, "Eject the items first!")
return
@@ -83,11 +83,11 @@
playsound(src.loc, I.usesound, 50, 1)
to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1)
else if(istype(I,/obj/item/weldingtool) && mode==-1)
if(contents.len > 0)
to_chat(user, "Eject the items first!")
return
var/obj/item/weapon/weldingtool/W = I
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, W.usesound, 100, 1)
to_chat(user, "You start slicing the floorweld off the disposal unit.")
@@ -107,12 +107,12 @@
to_chat(user, "You need more welding fuel to complete this task.")
return
if(istype(I, /obj/item/weapon/melee/energy/blade))
if(istype(I, /obj/item/melee/energy/blade))
to_chat(user, "You can't place that item inside the disposal unit.")
return
if(istype(I, /obj/item/weapon/storage))
var/obj/item/weapon/storage/S = I
if(istype(I, /obj/item/storage))
var/obj/item/storage/S = I
if((S.allow_quick_empty || S.allow_quick_gather) && S.contents.len)
S.hide_from(user)
user.visible_message("[user] empties \the [S] into \the [src].", "You empty \the [S] into \the [src].")
@@ -122,7 +122,7 @@
update()
return
var/obj/item/weapon/grab/G = I
var/obj/item/grab/G = I
if(istype(G)) // handle grabbed mob
if(ismob(G.affecting))
var/mob/GM = G.affecting
@@ -878,8 +878,8 @@
add_fingerprint(user)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0, user))
to_chat(user, "<span class='notice'>You begin slicing \the [src].</span>")
playsound(loc, W.usesound, 100, 1)
@@ -1199,8 +1199,8 @@
if(T.intact)
return // prevent interaction with T-scanner revealed pipes
src.add_fingerprint(user)
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(istype(I, /obj/item/weldingtool))
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(loc, W.usesound, 100, 1)
@@ -1314,7 +1314,7 @@
if(!I || !user)
return
src.add_fingerprint(user)
if(istype(I, /obj/item/weapon/screwdriver))
if(istype(I, /obj/item/screwdriver))
if(mode==0)
mode=1
playsound(src.loc, I.usesound, 50, 1)
@@ -1325,8 +1325,8 @@
playsound(src.loc, I.usesound, 50, 1)
to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
var/obj/item/weapon/weldingtool/W = I
else if(istype(I,/obj/item/weldingtool) && mode==1)
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, W.usesound, 100, 1)
to_chat(user, "You start slicing the floorweld off the disposal outlet.")
code/modules/recycling/sortingmachinery.dm
+12 -12
View File
@@ -45,7 +45,7 @@
qdel(sp)
playsound(loc, 'sound/items/poster_ripped.ogg', 50, 1)
else if(istype(W, /obj/item/weapon/pen))
else if(istype(W, /obj/item/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user, "<span class='notice'>Invalid text.</span>")
@@ -63,7 +63,7 @@
else
icon_state = "giftcloset"
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
new /obj/item/c_tube( get_turf(user) )
else
to_chat(user, "<span class='notice'>You need more paper.</span>")
@@ -109,7 +109,7 @@
qdel(sp)
playsound(loc, 'sound/items/poster_ripped.ogg', 50, 1)
else if(istype(W, /obj/item/weapon/pen))
else if(istype(W, /obj/item/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user, "<span class='notice'>Invalid text.</span>")
@@ -124,7 +124,7 @@
giftwrapped = 1
user.visible_message("<span class='notice'>[user] wraps the package in festive paper!</span>")
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
new /obj/item/c_tube( get_turf(user) )
else
to_chat(user, "<span class='notice'>You need more paper.</span>")
@@ -145,7 +145,7 @@
if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete
return
if(istype(target, /obj/item/smallDelivery) || istype(target,/obj/structure/bigDelivery) \
|| istype(target, /obj/item/weapon/evidencebag) || istype(target, /obj/structure/closet/body_bag))
|| istype(target, /obj/item/evidencebag) || istype(target, /obj/structure/closet/body_bag))
return
if(target.anchored)
return
@@ -154,7 +154,7 @@
if(istype(target, /obj/item) && !(istype(target, /obj/item/weapon/storage) && !istype(target,/obj/item/weapon/storage/box) && !istype(target, /obj/item/shippingPackage)))
if(istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box) && !istype(target, /obj/item/shippingPackage)))
var/obj/item/O = target
if(use(1))
var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc)) //Aaannd wrap it up!
@@ -205,7 +205,7 @@
user.create_attack_log("<font color='blue'>Has used [name] on [target]</font>")
if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
new /obj/item/c_tube( get_turf(user) )
return
/obj/item/device/destTagger
@@ -328,7 +328,7 @@
if(!I || !user)
return
if(istype(I, /obj/item/weapon/screwdriver))
if(istype(I, /obj/item/screwdriver))
if(c_mode==0)
c_mode=1
playsound(src.loc, I.usesound, 50, 1)
@@ -339,8 +339,8 @@
playsound(src.loc, I.usesound, 50, 1)
to_chat(user, "You attach the screws around the power connection.")
return
else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1)
var/obj/item/weapon/weldingtool/W = I
else if(istype(I,/obj/item/weldingtool) && c_mode==1)
var/obj/item/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, W.usesound, 100, 1)
to_chat(user, "You start slicing the floorweld off the delivery chute.")
@@ -370,7 +370,7 @@
/obj/item/shippingPackage/attackby(obj/item/O, mob/user, params)
if(sealed)
if(istype(O, /obj/item/weapon/pen))
if(istype(O, /obj/item/pen))
var/str = copytext(sanitize(input(user,"Intended recipient?","Address","")),1,MAX_NAME_LEN)
if(!str || !length(str))
to_chat(user, "<span class='notice'>Invalid text.</span>")
@@ -381,7 +381,7 @@
if(wrapped)
to_chat(user, "<span class='notice'>[src] already contains \a [wrapped].</span>")
return
if(istype(O, /obj/item) && !istype(O, /obj/item/weapon/storage) && !istype(O, /obj/item/shippingPackage))
if(istype(O, /obj/item) && !istype(O, /obj/item/storage) && !istype(O, /obj/item/shippingPackage))
if(!user.canUnEquip(O))
to_chat(user, "<span class='warning'>[O] is stuck to your hand, you cannot put it in [src]!</span>")
return