mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-20 20:37:34 +01:00
Removes Weapons (#7415)
* Adds icon and hitsound where needed. * Moves alt_attack to /obj/item and deletes weapons.dm * Replaced /obj/item/weapon with /obj/item * Fixes merge issues. * Fix merge issues.
This commit is contained in:
Werner
@@ -39,7 +39,7 @@ proc/admin_attacker_log_many_victims(var/mob/attacker, var/list/mob/victims, var
|
||||
for(var/mob/victim in victims)
|
||||
admin_attack_log(attacker, victim, attacker_message, victim_message, admin_message)
|
||||
|
||||
proc/admin_inject_log(mob/attacker, mob/victim, obj/item/weapon, reagents, temperature, amount_transferred, violent=0)
|
||||
proc/admin_inject_log(mob/attacker, mob/victim, obj/item/I, reagents, temperature, amount_transferred, violent=0)
|
||||
if(violent)
|
||||
violent = "violently "
|
||||
else
|
||||
@@ -48,6 +48,6 @@ proc/admin_inject_log(mob/attacker, mob/victim, obj/item/weapon, reagents, tempe
|
||||
var/temperature_text = "([temperature - (T0C + 20)]C)"
|
||||
admin_attack_log(attacker,
|
||||
victim,
|
||||
"used \the [weapon] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred",
|
||||
"was [violent]injected with \the [weapon] - [reagents] [temperature_text] - [amount_transferred]u transferred",
|
||||
"used \the [weapon] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into")
|
||||
"used \the [I] to [violent]inject - [reagents] [temperature_text] - [amount_transferred]u transferred",
|
||||
"was [violent]injected with \the [I] - [reagents] [temperature_text] - [amount_transferred]u transferred",
|
||||
"used \the [I] to [violent]inject [reagents] [temperature_text] ([amount_transferred]u transferred) into")
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
continue
|
||||
H.Paralyse(5)
|
||||
if(H.wear_id)
|
||||
var/obj/item/weapon/card/id/id = H.get_idcard()
|
||||
var/obj/item/card/id/id = H.get_idcard()
|
||||
for(var/A in id.access)
|
||||
if(A == access_security)
|
||||
security++
|
||||
if(!security)
|
||||
//strip their stuff before they teleport into a cell :downs:
|
||||
for(var/obj/item/weapon/W in H)
|
||||
for(var/obj/item/W in H)
|
||||
if(istype(W, /obj/item/organ/external))
|
||||
continue
|
||||
//don't strip organs
|
||||
|
||||
+19
-19
@@ -928,10 +928,10 @@
|
||||
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
|
||||
return
|
||||
|
||||
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand )
|
||||
if(!(istype(H.l_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie)))
|
||||
H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_r_hand )
|
||||
if(!(istype(H.r_hand,/obj/item/weapon/reagent_containers/food/snacks/cookie)))
|
||||
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_l_hand )
|
||||
if(!(istype(H.l_hand,/obj/item/reagent_containers/food/snacks/cookie)))
|
||||
H.equip_to_slot_or_del( new /obj/item/reagent_containers/food/snacks/cookie(H), slot_r_hand )
|
||||
if(!(istype(H.r_hand,/obj/item/reagent_containers/food/snacks/cookie)))
|
||||
log_admin("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].",admin_key=key_name(src.owner),ckey=key_name(H))
|
||||
message_admins("[key_name(H)] has their hands full, so they did not receive their cookie, spawned by [key_name(src.owner)].")
|
||||
return
|
||||
@@ -1028,17 +1028,17 @@
|
||||
|
||||
else if(href_list["AdminFaxView"])
|
||||
var/obj/item/fax = locate(href_list["AdminFaxView"])
|
||||
if (istype(fax, /obj/item/weapon/paper))
|
||||
var/obj/item/weapon/paper/P = fax
|
||||
if (istype(fax, /obj/item/paper))
|
||||
var/obj/item/paper/P = fax
|
||||
P.show_content(usr,1)
|
||||
else if (istype(fax, /obj/item/weapon/photo))
|
||||
var/obj/item/weapon/photo/H = fax
|
||||
else if (istype(fax, /obj/item/photo))
|
||||
var/obj/item/photo/H = fax
|
||||
H.show(usr)
|
||||
else if (istype(fax, /obj/item/weapon/paper_bundle))
|
||||
else if (istype(fax, /obj/item/paper_bundle))
|
||||
//having multiple people turning pages on a paper_bundle can cause issues
|
||||
//open a browse window listing the contents instead
|
||||
var/data = ""
|
||||
var/obj/item/weapon/paper_bundle/B = fax
|
||||
var/obj/item/paper_bundle/B = fax
|
||||
|
||||
for (var/page = 1, page <= B.pages.len, page++)
|
||||
var/obj/pageobj = B.pages[page]
|
||||
@@ -1050,15 +1050,15 @@
|
||||
|
||||
else if (href_list["AdminFaxViewPage"])
|
||||
var/page = text2num(href_list["AdminFaxViewPage"])
|
||||
var/obj/item/weapon/paper_bundle/bundle = locate(href_list["paper_bundle"])
|
||||
var/obj/item/paper_bundle/bundle = locate(href_list["paper_bundle"])
|
||||
|
||||
if (!bundle) return
|
||||
|
||||
if (istype(bundle.pages[page], /obj/item/weapon/paper))
|
||||
var/obj/item/weapon/paper/P = bundle.pages[page]
|
||||
if (istype(bundle.pages[page], /obj/item/paper))
|
||||
var/obj/item/paper/P = bundle.pages[page]
|
||||
P.show_content(src.owner.mob, 1)
|
||||
else if (istype(bundle.pages[page], /obj/item/weapon/photo))
|
||||
var/obj/item/weapon/photo/H = bundle.pages[page]
|
||||
else if (istype(bundle.pages[page], /obj/item/photo))
|
||||
var/obj/item/photo/H = bundle.pages[page]
|
||||
H.show(src.owner.mob)
|
||||
return
|
||||
|
||||
@@ -1095,7 +1095,7 @@
|
||||
|
||||
// give the sprite some time to flick
|
||||
spawn(20)
|
||||
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( F.loc )
|
||||
var/obj/item/paper/P = new /obj/item/paper( F.loc )
|
||||
P.name = "Sol Government- [customname]"
|
||||
P.info = input
|
||||
P.update_icon()
|
||||
@@ -1107,7 +1107,7 @@
|
||||
stampoverlay.icon_state = "paper_stamp-cap"
|
||||
if(!P.stamped)
|
||||
P.stamped = new
|
||||
P.stamped += /obj/item/weapon/stamp
|
||||
P.stamped += /obj/item/stamp
|
||||
P.overlays += stampoverlay
|
||||
P.stamps += "<HR><i>This paper has been stamped and encrypted by the Sol Government Quantum Relay.</i>"
|
||||
|
||||
@@ -1202,11 +1202,11 @@
|
||||
else if(!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob))
|
||||
removed_paths += dirty_path
|
||||
continue
|
||||
else if(ispath(path, /obj/item/weapon/gun/energy/pulse))
|
||||
else if(ispath(path, /obj/item/gun/energy/pulse))
|
||||
if(!check_rights(R_FUN,0))
|
||||
removed_paths += dirty_path
|
||||
continue
|
||||
else if(ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N
|
||||
else if(ispath(path, /obj/item/melee/energy/blade))//Not an item one should be able to spawn./N
|
||||
if(!check_rights(R_FUN,0))
|
||||
removed_paths += dirty_path
|
||||
continue
|
||||
|
||||
@@ -55,32 +55,32 @@
|
||||
var/obj/item/clothing/under/U = new /obj/item/clothing/under/rank/centcom_officer/bst(bst)
|
||||
bst.equip_to_slot_or_del(U, slot_w_uniform)
|
||||
bst.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/bst(bst), slot_l_ear)
|
||||
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/holding/bst(bst), slot_back)
|
||||
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/storage/backpack/holding/bst(bst), slot_back)
|
||||
bst.equip_to_slot_or_del(new /obj/item/storage/box/survival(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/bst(bst), slot_shoes)
|
||||
bst.equip_to_slot_or_del(new /obj/item/clothing/head/beret(bst), slot_head)
|
||||
bst.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/bst(bst), slot_glasses)
|
||||
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(bst), slot_belt)
|
||||
bst.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(bst), slot_belt)
|
||||
bst.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat/bst(bst), slot_gloves)
|
||||
if(bst.backbag == 1)
|
||||
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(bst), slot_r_hand)
|
||||
bst.equip_to_slot_or_del(new /obj/item/storage/box/ids(bst), slot_r_hand)
|
||||
else
|
||||
bst.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/storage/box/ids(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/device/t_scanner(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/device/pda/captain/bst(bst.back), slot_in_backpack)
|
||||
bst.equip_to_slot_or_del(new /obj/item/device/multitool(bst.back), slot_in_backpack)
|
||||
|
||||
var/obj/item/weapon/storage/box/pills = new /obj/item/weapon/storage/box(null, TRUE)
|
||||
var/obj/item/storage/box/pills = new /obj/item/storage/box(null, TRUE)
|
||||
pills.name = "adminordrazine"
|
||||
for(var/i = 1, i < 12, i++)
|
||||
new /obj/item/weapon/reagent_containers/pill/adminordrazine(pills)
|
||||
new /obj/item/reagent_containers/pill/adminordrazine(pills)
|
||||
bst.equip_to_slot_or_del(pills, slot_in_backpack)
|
||||
|
||||
//Implant because access
|
||||
bst.implant_loyalty(bst,TRUE)
|
||||
|
||||
//Sort out ID
|
||||
var/obj/item/weapon/card/id/bst/id = new/obj/item/weapon/card/id/bst(bst)
|
||||
var/obj/item/card/id/bst/id = new/obj/item/card/id/bst(bst)
|
||||
id.registered_name = bst.real_name
|
||||
id.assignment = "Bluespace Technician"
|
||||
id.name = "[id.assignment]"
|
||||
@@ -181,7 +181,7 @@
|
||||
real_name = "Bluespace Cat"
|
||||
mind.name = "Bluespace Cat"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -201,7 +201,7 @@
|
||||
real_name = "Bluespace Bot"
|
||||
mind.name = "Bluespace Bot"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -219,7 +219,7 @@
|
||||
real_name = "Bluespace Tree"
|
||||
mind.name = "Bluespace Tree"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -238,7 +238,7 @@
|
||||
real_name = "Bluespace Lizard"
|
||||
mind.name = "Bluespace Lizard"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -257,7 +257,7 @@
|
||||
real_name = "Bluespace Squid"
|
||||
mind.name = "Bluespace Squid"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -277,7 +277,7 @@
|
||||
real_name = "Bluespace Bug"
|
||||
mind.name = "Bluespace Bug"
|
||||
if(wear_id)
|
||||
var/obj/item/weapon/card/id/id = wear_id
|
||||
var/obj/item/card/id/id = wear_id
|
||||
if(istype(wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = wear_id
|
||||
id = pda.id
|
||||
@@ -357,7 +357,7 @@
|
||||
//All items with a /bst need the attack_hand() proc overrided to stop people getting overpowered items.
|
||||
|
||||
//Bag o Holding
|
||||
/obj/item/weapon/storage/backpack/holding/bst
|
||||
/obj/item/storage/backpack/holding/bst
|
||||
canremove = 0
|
||||
storage_slots = 56
|
||||
max_w_class = 400
|
||||
@@ -498,14 +498,14 @@
|
||||
return 1 //Because Bluespace
|
||||
|
||||
//ID
|
||||
/obj/item/weapon/card/id/bst
|
||||
/obj/item/card/id/bst
|
||||
icon_state = "centcom"
|
||||
desc = "An ID straight from Central Command. This one looks highly classified."
|
||||
// canremove = 0
|
||||
New()
|
||||
access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
|
||||
|
||||
/obj/item/weapon/card/id/bst/attack_hand()
|
||||
/obj/item/card/id/bst/attack_hand()
|
||||
if(!usr)
|
||||
return
|
||||
if(!istype(usr, /mob/living/carbon/human/bst))
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
else
|
||||
if(alert("Spawn that person a tome?",,"Yes","No")=="Yes")
|
||||
to_chat(M, "\red You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie. A tome, a message from your new master, appears on the ground.")
|
||||
new /obj/item/weapon/book/tome(M.loc)
|
||||
new /obj/item/book/tome(M.loc)
|
||||
else
|
||||
to_chat(M, "\red You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.")
|
||||
var/glimpse=pick("1","2","3","4","5","6","7","8")
|
||||
@@ -223,14 +223,14 @@
|
||||
if (istype(M, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if (H.wear_id)
|
||||
var/obj/item/weapon/card/id/id = H.wear_id
|
||||
var/obj/item/card/id/id = H.wear_id
|
||||
if(istype(H.wear_id, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/pda = H.wear_id
|
||||
id = pda.id
|
||||
id.icon_state = "gold"
|
||||
id.access = get_all_accesses()
|
||||
else
|
||||
var/obj/item/weapon/card/id/id = new/obj/item/weapon/card/id(M);
|
||||
var/obj/item/card/id/id = new/obj/item/card/id(M);
|
||||
id.icon_state = "gold"
|
||||
id.access = get_all_accesses()
|
||||
id.registered_name = H.real_name
|
||||
@@ -395,7 +395,7 @@
|
||||
|
||||
if(dostrip)
|
||||
for (var/obj/item/I in M)
|
||||
if (istype(I, /obj/item/weapon/implant))
|
||||
if (istype(I, /obj/item/implant))
|
||||
continue
|
||||
M.drop_from_inventory(I)
|
||||
if(I.loc != M)
|
||||
@@ -467,7 +467,7 @@
|
||||
for(var/obj/machinery/power/rad_collector/Rad in world)
|
||||
if(Rad.anchored)
|
||||
if(!Rad.P)
|
||||
var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
|
||||
var/obj/item/tank/phoron/Phoron = new/obj/item/tank/phoron(Rad)
|
||||
Phoron.air_contents.gas["phoron"] = 70
|
||||
Rad.drainratio = 0
|
||||
Rad.P = Phoron
|
||||
|
||||
Reference in New Issue
Block a user