cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01: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
code/modules/background/citizenship/human.dm
+7 -7
View File
@@ -30,9 +30,9 @@
uniform = /obj/item/clothing/under/lawyer/blue
accessory = /obj/item/clothing/accessory/tc_pin
backpack_contents = list(
/obj/item/weapon/storage/box/ceti_visa = 1,
/obj/item/weapon/storage/box/tcfl_pamphlet = 1,
/obj/item/weapon/gun/energy/pistol = 1
/obj/item/storage/box/ceti_visa = 1,
/obj/item/storage/box/tcfl_pamphlet = 1,
/obj/item/gun/energy/pistol = 1
)
@@ -66,9 +66,9 @@
accessory = /obj/item/clothing/accessory/sol_pin
backpack_contents = list(
/obj/item/weapon/storage/box/sol_visa = 1,
/obj/item/storage/box/sol_visa = 1,
/obj/item/device/camera = 1,
/obj/item/weapon/gun/projectile/pistol/sol = 1
/obj/item/gun/projectile/pistol/sol = 1
)
/datum/citizenship/sol_alliance/eridani
@@ -123,6 +123,6 @@
name = "Empire of Dominia Consular Officer"
backpack_contents = list(
/obj/item/weapon/storage/box/dominia_honor = 1,
/obj/item/weapon/gun/energy/pistol = 1
/obj/item/storage/box/dominia_honor = 1,
/obj/item/gun/energy/pistol = 1
)
code/modules/background/citizenship/tajara.dm
+3 -3
View File
@@ -31,8 +31,8 @@
uniform = /obj/item/clothing/under/suit_jacket/checkered
head = /obj/item/clothing/head/fedora
backpack_contents = list(
/obj/item/weapon/storage/box/hadii_card = 1,
/obj/item/weapon/storage/box/hadii_manifesto = 1,
/obj/item/weapon/gun/projectile/pistol/adhomai = 1
/obj/item/storage/box/hadii_card = 1,
/obj/item/storage/box/hadii_manifesto = 1,
/obj/item/gun/projectile/pistol/adhomai = 1
)
accessory = /obj/item/clothing/accessory/hadii_pin
code/modules/background/citizenship/unathi.dm
+1 -1
View File
@@ -41,4 +41,4 @@
uniform = /obj/item/clothing/under/unathi
suit = /obj/item/clothing/suit/unathi/mantle
backpack_contents = list(/obj/item/device/camera = 1)
belt = /obj/item/weapon/material/sword/dao
belt = /obj/item/material/sword/dao
code/modules/background/citizenship/vaurca.dm
+2 -2
View File
@@ -50,11 +50,11 @@
H.unEquip(H.back)
H.unEquip(H.shoes)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/typec(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/tcfl_pamphlet(H), slot_in_backpack)
H.equip_to_slot_or_del(new /obj/item/storage/box/tcfl_pamphlet(H), slot_in_backpack)
H.change_skin_color(r, g, b)
H.update_dna()