cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 01:53:35 +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/customitems/item_defines.dm
+24 -24
View File
@@ -126,16 +126,16 @@
to_chat(user, "You use [src] on yourself.")
qdel(src)
/obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood
/obj/item/claymore/fluff // MrBarrelrolll: Maximus Greenwood
name = "Greenwood's Blade"
desc = "A replica claymore with strange markings scratched into the blade."
force = 5
sharp = 0
/obj/item/weapon/claymore/fluff/hit_reaction()
/obj/item/claymore/fluff/hit_reaction()
return 0
/obj/item/weapon/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
/obj/item/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
name = "Zelda's Crowbar"
desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
icon = 'icons/obj/custom_items.dmi'
@@ -181,7 +181,7 @@
to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
/obj/item/weapon/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
/obj/item/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
name = "purple engraved zippo"
desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
icon = 'icons/obj/custom_items.dmi'
@@ -189,7 +189,7 @@
icon_on = "purple_zippo_on"
icon_off = "purple_zippo_off"
/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold
/obj/item/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold
name = "engraved lighter"
desc = "A golden lighter, engraved with some ornaments and a G."
icon = 'icons/obj/custom_items.dmi'
@@ -197,7 +197,7 @@
icon_on = "guessipon"
icon_off = "guessip"
/obj/item/weapon/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney
/obj/item/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney
name = "Monogrammed Zippo"
desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame."
icon = 'icons/obj/custom_items.dmi'
@@ -205,7 +205,7 @@
icon_on = "rybysfluffopen"
icon_off = "rybysfluff"
/obj/item/weapon/fluff/dogwhistle //phantasmicdream: Zeke Varloss
/obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss
name = "Sax's whistle"
desc = "This whistle seems to have a strange aura about it. Maybe you should blow on it?"
icon = 'icons/obj/custom_items.dmi'
@@ -213,7 +213,7 @@
item_state = "dogwhistle"
force = 2
/obj/item/weapon/fluff/dogwhistle/attack_self(mob/user)
/obj/item/fluff/dogwhistle/attack_self(mob/user)
user.visible_message("<span class='notice'>[user] blows on the whistle, but no sound comes out.</span>", "<span class='notice'>You blow on the whistle, but don't hear anything.</span>")
spawn(20)
var/mob/living/simple_animal/pet/corgi/C = new /mob/living/simple_animal/pet/corgi(get_turf(user))
@@ -226,7 +226,7 @@
to_chat(user, "<span class='danger'>[src] crumbles to dust in your hands!</span>")
qdel(src)
/obj/item/weapon/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad
/obj/item/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad
name = "lunchpail"
desc = "A simple black lunchpail."
icon = 'icons/obj/custom_items.dmi'
@@ -238,11 +238,11 @@
max_combined_w_class = 9
storage_slots = 3
/obj/item/weapon/storage/toolbox/fluff/lunchbox/New()
/obj/item/storage/toolbox/fluff/lunchbox/New()
..()
new /obj/item/weapon/reagent_containers/food/snacks/sandwich(src)
new /obj/item/weapon/reagent_containers/food/snacks/chips(src)
new /obj/item/weapon/reagent_containers/food/drinks/cans/cola(src)
new /obj/item/reagent_containers/food/snacks/sandwich(src)
new /obj/item/reagent_containers/food/snacks/chips(src)
new /obj/item/reagent_containers/food/drinks/cans/cola(src)
/obj/item/device/instrument/guitar/jello_guitar //Antcolon3: Dan Jello
@@ -346,9 +346,9 @@
if(!proximity || !ishuman(user) || user.incapacitated())
return
if(istype(target, /obj/item/weapon/melee/baton) && !istype(target, /obj/item/weapon/melee/baton/cattleprod))
if(istype(target, /obj/item/melee/baton) && !istype(target, /obj/item/melee/baton/cattleprod))
to_chat(user, "<span class='notice'>You modify the appearance of [target].</span>")
var/obj/item/weapon/melee/baton/the_baton = target
var/obj/item/melee/baton/the_baton = target
the_baton.base_icon = "desolate_baton"
the_baton.item_state = "desolate_baton"
the_baton.icon = 'icons/obj/custom_items.dmi'
@@ -766,7 +766,7 @@
item_state = "supplymaster_jacket_open"
ignore_suitadjust = 0
suit_adjusted = 1
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
actions_types = list(/datum/action/item_action/button)
@@ -927,7 +927,7 @@
icon_state = "xantholne_wintercoat"
hoodtype = /obj/item/clothing/head/hood/fluff/xantholne
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/toy, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/lighter)
allowed = list(/obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/head/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
@@ -1130,10 +1130,10 @@
flags = BLOCKHAIR
flags_inv = HIDEFACE
/obj/item/weapon/nullrod/fluff/chronx //chronx100: Hughe O'Splash
fluff_transformations = list(/obj/item/weapon/nullrod/fluff/chronx/scythe)
/obj/item/nullrod/fluff/chronx //chronx100: Hughe O'Splash
fluff_transformations = list(/obj/item/nullrod/fluff/chronx/scythe)
/obj/item/weapon/nullrod/fluff/chronx/scythe
/obj/item/nullrod/fluff/chronx/scythe
name = "Soul Collector"
desc = "An ancient scythe used by the worshipers of Cthulhu. Tales say it is used to prepare souls for Cthulhu's great devouring. Someone carved their name into the handle: Hughe O'Splash"
icon = 'icons/obj/custom_items.dmi'
@@ -1214,13 +1214,13 @@
species_fit = null
sprite_sheets = null
/obj/item/weapon/storage/backpack/fluff/krich_back //lizardzsi: Krichahka
/obj/item/storage/backpack/fluff/krich_back //lizardzsi: Krichahka
name = "Voxcaster"
desc = "Battered, Sol-made military radio backpack that had its speakers fried from playing Vox opera. The words 'Swift-Talon' are crudely scratched onto its side."
icon = 'icons/obj/custom_items.dmi'
icon_state = "voxcaster_fluff"
/obj/item/weapon/storage/backpack/fluff/ssscratches_back //Ssscratches: Lasshy-Bot
/obj/item/storage/backpack/fluff/ssscratches_back //Ssscratches: Lasshy-Bot
name = "CatPack"
desc = "It's a backpack, but it's also a cat."
icon = 'icons/obj/custom_items.dmi'
@@ -1285,7 +1285,7 @@
item_color = "fethasnecklace"
slot_flags = SLOT_MASK | SLOT_TIE
/obj/item/weapon/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez
/obj/item/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez
name = "Cosmic space blankie"
desc = "Made from the dreams of space children everywhere."
icon = 'icons/obj/custom_items.dmi'
@@ -1335,7 +1335,7 @@
used = 1
qdel(src)
/obj/item/weapon/bikehorn/fluff/pinkbikehorn //Xerdies: Squiddle Toodle
/obj/item/bikehorn/fluff/pinkbikehorn //Xerdies: Squiddle Toodle
name = "Honkinator5000"
desc = "This horn may look ridiculous but is the new hot item for clowns in the Clown Empire. It has a fine print on its side reading: Property of Prince Honktertong the IV"
icon = 'icons/obj/custom_items.dmi'
code/modules/customitems/item_spawning.dm
+6 -6
View File
@@ -26,9 +26,9 @@
var/obj/item/Item = new path()
var/description = query.item[4]
var/newname = query.item[5]
if(istype(Item,/obj/item/weapon/card/id))
var/obj/item/weapon/card/id/I = Item
for(var/obj/item/weapon/card/id/C in M)
if(istype(Item,/obj/item/card/id))
var/obj/item/card/id/I = Item
for(var/obj/item/card/id/C in M)
//default settings
I.name = "[M.real_name]'s ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
I.registered_name = M.real_name
@@ -40,14 +40,14 @@
qdel(C)
ok = M.equip_or_collect(I, slot_wear_id, 0) //if 1, last argument deletes on fail
break
else if(istype(M.back, /obj/item/weapon/storage)) // Try to place it in something on the mob's back
var/obj/item/weapon/storage/S = M.back
else if(istype(M.back, /obj/item/storage)) // Try to place it in something on the mob's back
var/obj/item/storage/S = M.back
if(S.contents.len < S.storage_slots)
Item.loc = M.back
ok = 1
to_chat(M, "<span class='notice'>Your [Item.name] has been added to your [M.back.name].</span>")
if(ok == 0)
for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
for(var/obj/item/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
if(S.contents.len < S.storage_slots)
Item.loc = S
ok = 1