cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +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/fish/fish_items.dm
+31 -31
View File
@@ -3,7 +3,7 @@
// Aquarium Supplies //
//////////////////////////////////////////////
/obj/item/weapon/egg_scoop
/obj/item/egg_scoop
name = "fish egg scoop"
desc = "A small scoop to collect fish eggs with."
icon = 'icons/obj/fish_items.dmi'
@@ -14,7 +14,7 @@
throw_speed = 3
throw_range = 7
/obj/item/weapon/fish_net
/obj/item/fish_net
name = "fish net"
desc = "A tiny net to capture fish with. It's a death sentence!"
icon = 'icons/obj/fish_items.dmi'
@@ -29,7 +29,7 @@
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
/obj/item/fishfood
name = "fish food can"
desc = "A small can of Carp's Choice brand fish flakes. The label shows a smiling Space Carp."
icon = 'icons/obj/fish_items.dmi'
@@ -39,7 +39,7 @@
throw_speed = 3
throw_range = 7
/obj/item/weapon/tank_brush
/obj/item/tank_brush
name = "aquarium brush"
desc = "A brush for cleaning the inside of aquariums. Contains a built-in odor neutralizer."
icon = 'icons/obj/fish_items.dmi'
@@ -59,7 +59,7 @@
// Fish Items //
//////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/shrimp
/obj/item/reagent_containers/food/snacks/shrimp
name = "shrimp"
desc = "A single raw shrimp."
icon = 'icons/obj/food/seafood.dmi'
@@ -72,7 +72,7 @@
reagents.add_reagent("protein", 1)
src.bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/feederfish
/obj/item/reagent_containers/food/snacks/feederfish
name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
@@ -84,7 +84,7 @@
reagents.add_reagent("protein", 1)
src.bitesize = 1
/obj/item/weapon/fish
/obj/item/fish
name = "fish"
desc = "A generic fish"
icon = 'icons/obj/fish_items.dmi'
@@ -97,43 +97,43 @@
attack_verb = list("slapped", "humiliated", "hit", "rubbed")
hitsound = 'sound/effects/snap.ogg'
/obj/item/weapon/fish/glofish
/obj/item/fish/glofish
name = "glofish"
desc = "A small bio-luminescent fish. Not very bright, but at least it's pretty!"
icon_state = "glofish"
/obj/item/weapon/fish/glofish/New()
/obj/item/fish/glofish/New()
..()
set_light(2,1,"#99FF66")
/obj/item/weapon/fish/electric_eel
/obj/item/fish/electric_eel
name = "electric eel"
desc = "An eel capable of producing a mild electric shock. Luckily it's rather weak out of water."
icon_state = "electric_eel"
/obj/item/weapon/fish/shark
/obj/item/fish/shark
name = "shark"
desc = "Warning: Keep away from tornadoes."
icon_state = "shark"
hitsound = 'sound/weapons/bite.ogg'
force = 3
/obj/item/weapon/fish/shark/attackby(var/obj/item/O, var/mob/user as mob)
if(istype(O, /obj/item/weapon/wirecutters))
/obj/item/fish/shark/attackby(var/obj/item/O, var/mob/user as mob)
if(istype(O, /obj/item/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))
new /obj/item/fish/toothless_shark(get_turf(src))
new /obj/item/shard/shark_teeth(get_turf(src))
qdel(src)
return
..()
/obj/item/weapon/fish/toothless_shark
/obj/item/fish/toothless_shark
name = "toothless shark"
desc = "Looks like someone ripped it's teeth out!"
icon_state = "shark"
hitsound = 'sound/effects/snap.ogg'
/obj/item/weapon/shard/shark_teeth
/obj/item/shard/shark_teeth
name = "shark teeth"
desc = "A number of teeth, supposedly from a shark."
icon = 'icons/obj/fish_items.dmi'
@@ -142,60 +142,60 @@
throwforce = 5.0
materials = list()
/obj/item/weapon/shard/shark_teeth/New()
/obj/item/shard/shark_teeth/New()
src.pixel_x = rand(-5,5)
src.pixel_y = rand(-5,5)
/obj/item/weapon/fish/catfish
/obj/item/fish/catfish
name = "catfish"
desc = "Apparently, catfish don't purr like you might have expected them to. Such a confusing name!"
icon_state = "catfish"
/obj/item/weapon/fish/catfish/attackby(var/obj/item/O, var/mob/user as mob)
/obj/item/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))
new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
qdel(src)
return
..()
/obj/item/weapon/fish/goldfish
/obj/item/fish/goldfish
name = "goldfish"
desc = "A goldfish, just like the one you never won at the county fair."
icon_state = "goldfish"
/obj/item/weapon/fish/salmon
/obj/item/fish/salmon
name = "salmon"
desc = "The second-favorite food of Space Bears, right behind crew members."
icon_state = "salmon"
/obj/item/weapon/fish/salmon/attackby(var/obj/item/O, var/mob/user as mob)
/obj/item/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))
new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
qdel(src)
return
..()
/obj/item/weapon/fish/babycarp
/obj/item/fish/babycarp
name = "baby space carp"
desc = "Substantially smaller than the space carp lurking outside the hull, but still unsettling."
icon_state = "babycarp"
hitsound = 'sound/weapons/bite.ogg'
force = 3
/obj/item/weapon/fish/babycarp/attackby(var/obj/item/O, var/mob/user as mob)
/obj/item/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.
new /obj/item/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
..()
/obj/item/weapon/grown/bananapeel/clownfish
/obj/item/grown/bananapeel/clownfish
name = "clown fish"
desc = "Even underwater, you cannot escape HONKing."
icon = 'icons/obj/fish_items.dmi'
code/modules/fish/fish_types.dm
+11 -11
View File
@@ -2,7 +2,7 @@
/datum/fish
var/fish_name = "generic fish"
var/egg_item = /obj/item/fish_eggs
var/fish_item = /obj/item/weapon/fish
var/fish_item = /obj/item/fish
var/crossbreeder = 1 //determines if the fish will attempt to breed with other types, set to 0 if you want the fish to only lay eggs with its own species
/datum/fish/proc/special_interact(obj/machinery/fishtank/my_tank)
@@ -11,32 +11,32 @@
/datum/fish/goldfish
fish_name = "goldfish"
egg_item = /obj/item/fish_eggs/goldfish
fish_item = /obj/item/weapon/fish/goldfish
fish_item = /obj/item/fish/goldfish
/datum/fish/glofish
fish_name = "glofish"
egg_item = /obj/item/fish_eggs/glofish
fish_item = /obj/item/weapon/fish/glofish
fish_item = /obj/item/fish/glofish
/datum/fish/clownfish
fish_name = "clownfish"
egg_item = /obj/item/fish_eggs/clownfish
fish_item = /obj/item/weapon/grown/bananapeel/clownfish
fish_item = /obj/item/grown/bananapeel/clownfish
/datum/fish/shark
fish_name = "shark"
egg_item = /obj/item/fish_eggs/shark
fish_item = /obj/item/weapon/fish/shark
fish_item = /obj/item/fish/shark
/datum/fish/babycarp
fish_name = "baby space carp"
egg_item = /obj/item/fish_eggs/babycarp
fish_item = /obj/item/weapon/fish/babycarp
fish_item = /obj/item/fish/babycarp
/datum/fish/catfish
fish_name = "catfish"
egg_item = /obj/item/fish_eggs/catfish
fish_item = /obj/item/weapon/fish/catfish
fish_item = /obj/item/fish/catfish
/datum/fish/catfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))
@@ -47,18 +47,18 @@
/datum/fish/salmon
fish_name = "salmon"
egg_item = /obj/item/fish_eggs/salmon
fish_item = /obj/item/weapon/fish/salmon
fish_item = /obj/item/fish/salmon
/datum/fish/shrimp
fish_name = "shrimp"
egg_item = /obj/item/fish_eggs/shrimp
fish_item = /obj/item/weapon/reagent_containers/food/snacks/shrimp
fish_item = /obj/item/reagent_containers/food/snacks/shrimp
crossbreeder = 0
/datum/fish/feederfish
fish_name = "feeder fish"
egg_item = /obj/item/fish_eggs/feederfish
fish_item = /obj/item/weapon/reagent_containers/food/snacks/feederfish
fish_item = /obj/item/reagent_containers/food/snacks/feederfish
/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))
@@ -72,5 +72,5 @@
/datum/fish/electric_eel
fish_name = "electric eel"
egg_item = /obj/item/fish_eggs/electric_eel
fish_item = /obj/item/weapon/fish/electric_eel
fish_item = /obj/item/fish/electric_eel
crossbreeder = 0
code/modules/fish/fishtank.dm
+10 -10
View File
@@ -336,7 +336,7 @@
if(!deconstruct) //Check if we are deconstructing or breaking the tank
var/shards_left = shard_count
while(shards_left > 0) //Produce the appropriate number of glass shards
new /obj/item/weapon/shard(get_turf(src))
new /obj/item/shard(get_turf(src))
shards_left --
if(water_level) //Spill any water that was left in the tank when it broke
spill_water()
@@ -612,8 +612,8 @@
/obj/machinery/fishtank/attackby(var/obj/item/O, var/mob/user as mob)
//Welders repair damaged tanks on help intent, damage on all others
if(istype(O, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = O
if(istype(O, /obj/item/weldingtool))
var/obj/item/weldingtool/W = O
if(user.a_intent == INTENT_HELP)
if(W.isOn())
if(cur_health < max_health)
@@ -632,11 +632,11 @@
return
//Open reagent containers add and remove water
if(O.is_open_container())
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(istype(O, /obj/item/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
var/obj/item/reagent_containers/glass/C = O
//Containers with any reagents will get dumped in
if(C.reagents.total_volume)
var/water_value = 0
@@ -680,7 +680,7 @@
user.visible_message("[user.name] scoops out some water from \the [src].", "You fill [C.name] with the last of the water in \the [src].")
return
//Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process
if(istype(O, /obj/item/weapon/wrench))
if(istype(O, /obj/item/wrench))
if(water_level == 0)
to_chat(usr, "<span class='notice'>Now disassembling [src].</span>")
playsound(src.loc, O.usesound, 50, 1)
@@ -704,7 +704,7 @@
qdel(egg)
return
//Fish food
else if(istype(O, /obj/item/weapon/fishfood))
else if(istype(O, /obj/item/fishfood))
//Only add food if there is water and it isn't already full of food
if(water_level)
if(food_level < 10)
@@ -719,7 +719,7 @@
to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
return
//Fish egg scoop
else if(istype(O, /obj/item/weapon/egg_scoop))
else if(istype(O, /obj/item/egg_scoop))
if(egg_count)
user.visible_message("[user.name] harvests some fish eggs from \the [src].", "You scoop the fish eggs out of \the [src].")
harvest_eggs(user)
@@ -727,11 +727,11 @@
user.visible_message("[user.name] fails to harvest any fish eggs from \the [src].", "There are no fish eggs in \the [src] to scoop out.")
return
//Fish net
if(istype(O, /obj/item/weapon/fish_net))
if(istype(O, /obj/item/fish_net))
harvest_fish(user)
return
//Tank brush
if(istype(O, /obj/item/weapon/tank_brush))
if(istype(O, /obj/item/tank_brush))
if(filth_level == 0)
to_chat(usr, "[src] is already spotless!")
else