cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +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/modules/fish/fish_items.dm
-6
View File
@@ -40,7 +40,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
to_chat(viewers(user), "<span class='warning'>[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.</span>")
return(OXYLOSS)
/obj/item/weapon/fishfood
@@ -67,7 +66,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
suicide_act(mob/user)
to_chat(viewers(user), "<span class='warning'>[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.</span>")
return(BRUTELOSS|FIRELOSS)
//////////////////////////////////////////////
@@ -136,7 +134,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/shark/attackby(var/obj/item/O, var/mob/user as mob)
if(istype(O, /obj/item/weapon/wirecutters))
to_chat(user, "You rip out the teeth of \the [src.name]!")
new /obj/item/weapon/fish/toothless_shark(get_turf(src))
new /obj/item/weapon/shard/shark_teeth(get_turf(src))
qdel(src)
@@ -170,7 +167,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/catfish/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src))
new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src))
qdel(src)
@@ -190,7 +186,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/salmon/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src))
new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src))
qdel(src)
@@ -207,7 +202,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
/obj/item/weapon/fish/babycarp/attackby(var/obj/item/O, var/mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
code/modules/fish/fishtank.dm
-18
View File
@@ -312,7 +312,6 @@
else
to_chat(usr, "The eggs disolve in the water. They were duds!")
/obj/machinery/fishtank/proc/select_egg_type()
var/fish = pick(fish_list) //Select a fish from the fish in the tank
if(prob(25)) //25% chance to be a dud (blank) egg
@@ -342,7 +341,6 @@
/obj/machinery/fishtank/proc/harvest_fish(var/mob/user)
if(!fish_count) //Can't catch non-existant fish!
to_chat(usr, "There are no fish in \the [src] to catch!")
return
var/caught_fish
@@ -499,7 +497,6 @@
//Finally, report the full examine_message constructed from the above reports
to_chat(user, "[examine_message]")
return examine_message
//////////////////////////////
@@ -527,7 +524,6 @@
M.health = M.maxHealth //Eating fish heals the predator
else
to_chat(usr, "There are no fish in [src]!")
else
attack_generic(M, M.harm_intent_damage)
else if(istype(M, /mob/living/simple_animal/hostile/bear))
@@ -546,7 +542,6 @@
M.health = M.maxHealth //Eating fish heals the predator
else
to_chat(usr, "There are no fish in [src]!")
else
attack_generic(M, M.harm_intent_damage)
else
@@ -612,16 +607,13 @@
if(W.isOn())
if(cur_health < max_health)
to_chat(usr, "You repair some of the cracks on \the [src].")
cur_health += 20
check_health()
else
to_chat(usr, "There is no damage to fix!")
else
if(cur_health < max_health)
to_chat(usr, "[W.name] must on to repair this damage.")
else
user.changeNext_move(CLICK_CD_MELEE)
hit(W.force)
@@ -631,7 +623,6 @@
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(lid_switch)
to_chat(usr, "Open the lid on \the [src] first!")
return
var/obj/item/weapon/reagent_containers/glass/C = O
//Containers with any reagents will get dumped in
@@ -650,7 +641,6 @@
else
if(water_level == water_capacity)
to_chat(usr, "[src] is already full!")
return
else
message = "The filtration process purifies the water, raising the water level."
@@ -667,7 +657,6 @@
else
if(water_level == 0)
to_chat(usr, "[src] is empty!")
else
if(water_level >= C.volume) //Enough to fill the container completely
C.reagents.add_reagent("fishwater", C.volume)
@@ -683,13 +672,11 @@
if(istype(O, /obj/item/weapon/wrench))
if(water_level == 0)
to_chat(usr, "<span class='notice'>Now disassembling [src].</span>")
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
if(do_after(user,50, target = src))
destroy(1)
else
to_chat(usr, "[src] must be empty before you disassemble it!")
return
//Fish eggs
else if(istype(O, /obj/item/fish_eggs))
@@ -697,12 +684,10 @@
//Don't add eggs if there is no water (they kinda need that to live)
if(water_level == 0)
to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!")
else
//Don't add eggs if the tank already has the max number of fish
if(fish_count >= max_fish)
to_chat(usr, "[src] can't hold any more fish.")
else
add_fish(egg.fish_type)
qdel(egg)
@@ -719,10 +704,8 @@
food_level += 10
else
to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.")
else
to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
check_food_level()
return
//Fish egg scoop
@@ -741,7 +724,6 @@
if(istype(O, /obj/item/weapon/tank_brush))
if(filth_level == 0)
to_chat(usr, "[src] is already spotless!")
else
filth_level = 0
user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.")