cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 13:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes Weapons (#7415)

Browse Source 
* 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
2019-11-16 18:36:13 +01:00
committed by GitHub
parent 128ca2235b
commit af16a489a6
1123 changed files with 27193 additions and 27175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/modules/admin/verbs/bluespacetech.dm
View File

@@ -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))

10
code/modules/admin/verbs/debug.dm
View File

@@ -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