cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/backpack.dm
-3
View File
@@ -43,7 +43,6 @@
attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(crit_fail)
to_chat(user, "\red The Bluespace generator isn't working.")
return
else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
@@ -68,10 +67,8 @@
if (prob(src.reliability))
to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure
else
to_chat(user, "\red The Bluespace generator malfunctions!")
for (var/obj/O in src.contents) //it broke, delete what was in it
qdel(O)
crit_fail = 1
code/game/objects/items/weapons/storage/bags.dm
-3
View File
@@ -94,7 +94,6 @@
if(slot==slot_head && contents.len)
to_chat(M, "\red You need to empty the bag first!")
return 0
return ..()
@@ -228,7 +227,6 @@
if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood))
if(!stop_messages)
to_chat(usr, "The snatcher does not accept [W].")
return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
var/current = 0
for(var/obj/item/stack/sheet/S in contents)
@@ -236,7 +234,6 @@
if(capacity == current)//If it's full, you're done
if(!stop_messages)
to_chat(usr, "\red The snatcher is full.")
return 0
return 1
code/game/objects/items/weapons/storage/belt.dm
-4
View File
@@ -415,10 +415,8 @@
if (prob(src.reliability))
to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure
else
to_chat(user, "\red The Bluespace generator malfunctions!")
for (var/obj/O in src.contents) //it broke, delete what was in it
qdel(O)
crit_fail = 1
@@ -494,7 +492,6 @@
if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet))
return
to_chat(user, "Planting explosives...")
user.visible_message("[user.name] is fiddling with their toolbelt.")
if(ismob(target))
user.attack_log += "\[[time_stamp()]\] <font color='red'> [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])</font>"
@@ -513,7 +510,6 @@
user.visible_message("\red [user.name] finished planting an explosive on [target.name]!")
target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
to_chat(user, "You sacrifice your belt for the sake of justice. Timer counting down from 15.")
spawn(150)
if(target)
if(ismob(target) || isobj(target))
code/game/objects/items/weapons/storage/bible.dm
-11
View File
@@ -10,7 +10,6 @@
suicide_act(mob/user)
to_chat(viewers(user), "<span class='warning'><b>[user] stares into [src.name] and attempts to trascend understanding of the universe!</b></span>")
return (user.dust())
@@ -55,17 +54,14 @@
if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
to_chat(user, "\red You don't have the dexterity to do this!")
return
if(!chaplain)
to_chat(user, "\red The book sizzles in your hands.")
user.take_organ_damage(0,10)
return
if ((CLUMSY in user.mutations) && prob(50))
to_chat(user, "\red The [src] slips out of your hand and hits your head.")
user.take_organ_damage(10)
user.Paralyse(20)
return
@@ -76,22 +72,18 @@
if (M.stat !=2)
/*if((M.mind in ticker.mode.cult) && (prob(20)))
to_chat(M, "\red The power of [src.deity_name] clears your mind of heresy!")
to_chat(user, "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!")
ticker.mode.remove_cultist(M.mind)*/
if ((istype(M, /mob/living/carbon/human) && prob(60)))
bless(M)
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] heals [] with the power of [src.deity_name]!</B>", user, M), 1)
to_chat(M, "\red May the power of [src.deity_name] compel you to be healed!")
playsound(src.loc, "punch", 25, 1, -1)
else
if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet))
M.adjustBrainLoss(10)
to_chat(M, "\red You feel dumber.")
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] beats [] over the head with []!</B>", user, M, src), 1)
playsound(src.loc, "punch", 25, 1, -1)
@@ -106,19 +98,16 @@
return
if (istype(A, /turf/simulated/floor))
to_chat(user, "<span class='notice'>You hit the floor with the bible.</span>")
if(user.mind && (user.mind.assigned_role == "Chaplain"))
call(/obj/effect/rune/proc/revealrunes)(src)
if(user.mind && (user.mind.assigned_role == "Chaplain"))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
to_chat(user, "<span class='notice'>You bless [A].</span>")
var/water2holy = A.reagents.get_reagent_amount("water")
A.reagents.del_reagent("water")
A.reagents.add_reagent("holywater",water2holy)
if(A.reagents && A.reagents.has_reagent("unholywater")) //yeah yeah, copy pasted code - sue me
to_chat(user, "<span class='notice'>You purify [A].</span>")
var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
A.reagents.del_reagent("unholywater")
A.reagents.add_reagent("holywater",unholy2clean)
code/game/objects/items/weapons/storage/fancy.dm
-9
View File
@@ -30,16 +30,13 @@
if(contents.len <= 0)
to_chat(user, "There are no [src.icon_type]s left in the box.")
else if(contents.len == 1)
to_chat(user, "There is one [src.icon_type] left in the box.")
else
to_chat(user, "There are [src.contents.len] [src.icon_type]s in the box.")
/*
* Donut Box
*/
@@ -146,11 +143,9 @@
switch(W:colourName)
if("mime")
to_chat(usr, "This crayon is too sad to be contained in this box.")
return
if("rainbow")
to_chat(usr, "This crayon is too powerful to be contained in this box.")
return
..()
@@ -223,13 +218,11 @@
lace_cigarette(C)
user.equip_to_slot_if_possible(C, slot_wear_mask)
to_chat(user, "<span class='notice'>You take \a [C.name] out of the pack.</span>")
update_icon()
got_cig = 1
break
if(!got_cig)
to_chat(user, "<span class='warning'>There are no smokables in the pack!</span>")
else
..()
@@ -239,14 +232,12 @@
if(M.lit == 1)
if(!stop_messages)
to_chat(usr, "<span class='notice'>Putting a lit [W] in [src] probably isn't a good idea.</span>")
return 0
if(istype(W, /obj/item/weapon/lighter))
var/obj/item/weapon/lighter/L = W
if(L.lit == 1)
if(!stop_messages)
to_chat(usr, "<span class='notice'>Putting [W] in [src] while lit probably isn't a good idea.</span>")
return 0
//if we get this far, handle the insertion checks as normal
.=..()
code/game/objects/items/weapons/storage/firstaid.dm
-2
View File
@@ -249,10 +249,8 @@
var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
if(length(tmp_label) > MAX_NAME_LEN)
to_chat(user, "<span class='warning'>The label can be at most [MAX_NAME_LEN] characters long.</span>")
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
label_text = tmp_label
update_name_label()
else
code/game/objects/items/weapons/storage/lockbox.dm
-8
View File
@@ -21,24 +21,20 @@
if (istype(W, /obj/item/weapon/card/id))
if(src.broken)
to_chat(user, "\red It appears to be broken.")
return
if(src.allowed(user))
src.locked = !( src.locked )
if(src.locked)
src.icon_state = src.icon_locked
to_chat(user, "\red You lock the [src.name]!")
return
else
src.icon_state = src.icon_closed
to_chat(user, "\red You unlock the [src.name]!")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
return
else
to_chat(user, "\red Access Denied")
else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken)
emag_act(user)
return
@@ -46,14 +42,12 @@
..()
else
to_chat(user, "\red Its locked!")
return
show_to(mob/user as mob)
if(locked)
to_chat(user, "\red Its locked!")
else
..()
return
@@ -63,7 +57,6 @@
return ..()
if(!stop_messages)
to_chat(usr, "<span class='notice'>[src] is locked!</span>")
return 0
/obj/item/weapon/storage/lockbox/emag_act(user as mob)
@@ -73,7 +66,6 @@
desc = "It appears to be broken."
icon_state = src.icon_broken
to_chat(user, "<span class='notice'>You unlock \the [src].</span>")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
return
code/game/objects/items/weapons/storage/secure.dm
-5
View File
@@ -31,7 +31,6 @@
if(..(user, 1))
to_chat(user, text("The service panel is [src.open ? "open" : "closed"]."))
attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(locked)
if ((istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))
@@ -80,10 +79,8 @@
playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src.loc, "sparks", 50, 1)
to_chat(user, "You slice through the lock on [src].")
else
to_chat(user, "You short out the lock on [src].")
return
@@ -148,7 +145,6 @@
return ..()
if(!stop_messages)
to_chat(usr, "<span class='notice'>[src] is locked!</span>")
return 0
/obj/item/weapon/storage/secure/hear_talk(mob/living/M as mob, msg)
@@ -177,7 +173,6 @@
attack_hand(mob/user as mob)
if ((src.loc == user) && (src.locked == 1))
to_chat(usr, "\red [src] is locked and cannot be opened!")
else if ((src.loc == user) && (!src.locked))
playsound(src.loc, "rustle", 50, 1, -5)
if (user.s_active)
code/game/objects/items/weapons/storage/storage.dm
-12
View File
@@ -236,7 +236,6 @@
if(contents.len >= storage_slots)
if(!stop_messages)
to_chat(usr, "<span class='warning'>[W] won't fit in [src], make some space!</span>")
return 0 //Storage item is full
if(can_hold.len)
@@ -250,20 +249,17 @@
if (istype(W, /obj/item/weapon/hand_labeler))
return 0
to_chat(usr, "<span class='notice'>[src] cannot hold [W].</span>")
return 0
for(var/A in cant_hold) //Check for specific items which this container can't hold.
if(istype(W, text2path(A) ))
if(!stop_messages)
to_chat(usr, "<span class='notice'>[src] cannot hold [W].</span>")
return 0
if (W.w_class > max_w_class)
if(!stop_messages)
to_chat(usr, "<span class='notice'>[W] is too big for this [src].</span>")
return 0
var/sum_w_class = W.w_class
@@ -273,19 +269,16 @@
if(sum_w_class > max_combined_w_class)
if(!stop_messages)
to_chat(usr, "<span class='notice'>[src] is full, make some space.</span>")
return 0
if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage)))
if(!istype(src, /obj/item/weapon/storage/backpack/holding)) //bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm.
if(!stop_messages)
to_chat(usr, "<span class='notice'>[src] cannot hold [W] as it's a storage item of the same size.</span>")
return 0 //To prevent the stacking of same sized storage items.
if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry.
to_chat(usr, "<span class='notice'>\the [W] is stuck to your hand, you can't put it in \the [src]</span>")
return 0
return 1
@@ -314,7 +307,6 @@
for(var/mob/M in viewers(usr, null))
if (M == usr)
to_chat(usr, "<span class='notice'>You put the [W] into [src].</span>")
else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")
else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
@@ -368,7 +360,6 @@
if(isrobot(user))
to_chat(user, "\blue You're a robot. No.")
return 1//Robots can't interact with storage items.
if(!can_be_inserted(W))
@@ -416,12 +407,10 @@
switch (collection_mode)
if(1)
to_chat(usr, "[src] now picks up all items in a tile at once.")
if(0)
to_chat(usr, "[src] now picks up one item at a time.")
/obj/item/weapon/storage/verb/quick_empty()
set name = "Empty Contents"
set category = "Object"
@@ -509,7 +498,6 @@
return
// Now make the cardboard
to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
new src.foldable(get_turf(src))
qdel(src)
//BubbleWrap END
code/game/objects/items/weapons/storage/toolbox.dm
-1
View File
@@ -19,7 +19,6 @@
..()
if (src.type == /obj/item/weapon/storage/toolbox)
to_chat(world, "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]")
qdel(src)
/obj/item/weapon/storage/toolbox/emergency