cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 03:52:52 +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

16
code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
View File

@@ -1,22 +1,22 @@
/datum/gear/cosmetic
display_name = "purple comb"
path = /obj/item/weapon/haircomb
path = /obj/item/haircomb
sort_category = "Cosmetics"
/datum/gear/cosmetic/lipstick
display_name = "lipstick selection"
path = /obj/item/weapon/lipstick
path = /obj/item/lipstick
/datum/gear/cosmetic/lipstick/New()
..()
var/lipsticks = list()
lipsticks["lipstick, red"] = /obj/item/weapon/lipstick
lipsticks["lipstick, purple"] = /obj/item/weapon/lipstick/purple
lipsticks["lipstick, jade"] = /obj/item/weapon/lipstick/jade
lipsticks["lipstick, black"] = /obj/item/weapon/lipstick/black
lipsticks["lipstick, pink"] = /obj/item/weapon/lipstick/pink
lipsticks["lipstick, red"] = /obj/item/lipstick
lipsticks["lipstick, purple"] = /obj/item/lipstick/purple
lipsticks["lipstick, jade"] = /obj/item/lipstick/jade
lipsticks["lipstick, black"] = /obj/item/lipstick/black
lipsticks["lipstick, pink"] = /obj/item/lipstick/pink
gear_tweaks += new/datum/gear_tweak/path(lipsticks)
/datum/gear/cosmetic/mirror
display_name = "handheld mirror"
path = /obj/item/weapon/mirror
path = /obj/item/mirror

94
code/modules/client/preference_setup/loadout/loadout_general.dm
View File

@@ -1,38 +1,38 @@
/datum/gear/cane
display_name = "cane"
path = /obj/item/weapon/cane
path = /obj/item/cane
/datum/gear/dice
display_name = "pack of dice"
path = /obj/item/weapon/storage/pill_bottle/dice
path = /obj/item/storage/pill_bottle/dice
/datum/gear/dicegaming
display_name = "pack of gaming dice"
path = /obj/item/weapon/storage/pill_bottle/dice/gaming
path = /obj/item/storage/pill_bottle/dice/gaming
/datum/gear/cards
display_name = "deck of cards"
path = /obj/item/weapon/deck/cards
path = /obj/item/deck/cards
/datum/gear/tarot
display_name = "deck of tarot cards"
path = /obj/item/weapon/deck/tarot
path = /obj/item/deck/tarot
/datum/gear/holder
display_name = "card holder"
path = /obj/item/weapon/storage/card
path = /obj/item/storage/card
/datum/gear/cardemon_pack
display_name = "cardemon booster pack"
path = /obj/item/weapon/pack/cardemon
path = /obj/item/pack/cardemon
/datum/gear/spaceball_pack
display_name = "spaceball booster pack"
path = /obj/item/weapon/pack/spaceball
path = /obj/item/pack/spaceball
/datum/gear/flask
display_name = "flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/barflask
path = /obj/item/reagent_containers/food/drinks/flask/barflask
/datum/gear/flask/New()
..()
@@ -40,7 +40,7 @@
/datum/gear/vacflask_cold
display_name = "cold vacuum-flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask
path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask
/datum/gear/vacflask_cold/New()
..()
@@ -48,13 +48,13 @@
/datum/gear/vacflask_cold/spawn_item(var/location, var/metadata)
. = ..()
var/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/spawned_flask = .
var/obj/item/reagent_containers/food/drinks/flask/vacuumflask/spawned_flask = .
if(istype(spawned_flask) && spawned_flask.reagents)
spawned_flask.reagents.set_temperature(T0C + 5)
/datum/gear/vacflask_hot
display_name = "hot vacuum-flask"
path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask
path = /obj/item/reagent_containers/food/drinks/flask/vacuumflask
/datum/gear/vacflask_hot/New()
..()
@@ -62,7 +62,7 @@
/datum/gear/vacflask_hot/spawn_item(var/location, var/metadata)
. = ..()
var/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/spawned_flask = .
var/obj/item/reagent_containers/food/drinks/flask/vacuumflask/spawned_flask = .
if(istype(spawned_flask) && spawned_flask.reagents)
spawned_flask.reagents.set_temperature(T0C + 45)
@@ -70,13 +70,13 @@
display_name = "lunchbox"
description = "A little lunchbox."
cost = 2
path = /obj/item/weapon/storage/toolbox/lunchbox
path = /obj/item/storage/toolbox/lunchbox
/datum/gear/lunchbox/New()
..()
var/list/lunchboxes = list()
for(var/lunchbox_type in typesof(/obj/item/weapon/storage/toolbox/lunchbox))
var/obj/item/weapon/storage/toolbox/lunchbox/lunchbox = lunchbox_type
for(var/lunchbox_type in typesof(/obj/item/storage/toolbox/lunchbox))
var/obj/item/storage/toolbox/lunchbox/lunchbox = lunchbox_type
if(!initial(lunchbox.filled))
lunchboxes[initial(lunchbox.name)] = lunchbox_type
sortTim(lunchboxes, /proc/cmp_text_asc)
@@ -85,48 +85,48 @@
/datum/gear/banner
display_name = "banner selection"
path = /obj/item/weapon/flag
path = /obj/item/flag
/datum/gear/banner/New()
..()
var/banners = list()
banners["banner, SolGov"] = /obj/item/weapon/flag/sol
banners["banner, Dominia"] = /obj/item/weapon/flag/dominia
banners["banner, Elyra"] = /obj/item/weapon/flag/elyra
banners["banner, Hegemony"] = /obj/item/weapon/flag/hegemony
banners["banner, Jargon"] = /obj/item/weapon/flag/jargon
banners["banner, NanoTrasen"] = /obj/item/weapon/flag/nanotrasen
banners["banner, Eridani Fed"] = /obj/item/weapon/flag/eridani
banners["banner, Sedantis"] = /obj/item/weapon/flag/vaurca
banners["banner, People's Republic of Adhomai"] = /obj/item/weapon/flag/pra
banners["banner, Democratic People's Republic of Adhomai"] = /obj/item/weapon/flag/dpra
banners["banner, New Kingdom of Adhomai"] = /obj/item/weapon/flag/nka
banners["banner, SolGov"] = /obj/item/flag/sol
banners["banner, Dominia"] = /obj/item/flag/dominia
banners["banner, Elyra"] = /obj/item/flag/elyra
banners["banner, Hegemony"] = /obj/item/flag/hegemony
banners["banner, Jargon"] = /obj/item/flag/jargon
banners["banner, NanoTrasen"] = /obj/item/flag/nanotrasen
banners["banner, Eridani Fed"] = /obj/item/flag/eridani
banners["banner, Sedantis"] = /obj/item/flag/vaurca
banners["banner, People's Republic of Adhomai"] = /obj/item/flag/pra
banners["banner, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra
banners["banner, New Kingdom of Adhomai"] = /obj/item/flag/nka
gear_tweaks += new/datum/gear_tweak/path(banners)
/datum/gear/flag
display_name = "flag selection"
cost = 2
path = /obj/item/weapon/flag
path = /obj/item/flag
/datum/gear/flag/New()
..()
var/flags = list()
flags["flag, SolGov"] = /obj/item/weapon/flag/sol/l
flags["flag, Dominia"] = /obj/item/weapon/flag/dominia/l
flags["flag, Elyra"] = /obj/item/weapon/flag/elyra/l
flags["flag, Hegemony"] = /obj/item/weapon/flag/hegemony/l
flags["flag, Jargon"] = /obj/item/weapon/flag/jargon/l
flags["flag, NanoTrasen"] = /obj/item/weapon/flag/nanotrasen/l
flags["flag, Eridani Fed"] = /obj/item/weapon/flag/eridani/l
flags["flag, Sedantis"] = /obj/item/weapon/flag/vaurca/l
flags["flag, People's Republic of Adhomai"] = /obj/item/weapon/flag/pra/l
flags["flag, Democratic People's Republic of Adhomai"] = /obj/item/weapon/flag/dpra/l
flags["flag, New Kingdom of Adhomai"] = /obj/item/weapon/flag/nka/l
flags["flag, SolGov"] = /obj/item/flag/sol/l
flags["flag, Dominia"] = /obj/item/flag/dominia/l
flags["flag, Elyra"] = /obj/item/flag/elyra/l
flags["flag, Hegemony"] = /obj/item/flag/hegemony/l
flags["flag, Jargon"] = /obj/item/flag/jargon/l
flags["flag, NanoTrasen"] = /obj/item/flag/nanotrasen/l
flags["flag, Eridani Fed"] = /obj/item/flag/eridani/l
flags["flag, Sedantis"] = /obj/item/flag/vaurca/l
flags["flag, People's Republic of Adhomai"] = /obj/item/flag/pra/l
flags["flag, Democratic People's Republic of Adhomai"] = /obj/item/flag/dpra/l
flags["flag, New Kingdom of Adhomai"] = /obj/item/flag/nka/l
gear_tweaks += new/datum/gear_tweak/path(flags)
/datum/gear/towel
display_name = "towel"
path = /obj/item/weapon/towel
path = /obj/item/towel
/datum/gear/towel/New()
..()
@@ -134,11 +134,11 @@
/datum/gear/checkers
display_name = "checkers game kit"
path = /obj/item/weapon/storage/box/checkers_kit
path = /obj/item/storage/box/checkers_kit
/datum/gear/chess
display_name = "chess game kit"
path = /obj/item/weapon/storage/box/chess_kit
path = /obj/item/storage/box/chess_kit
/datum/gear/battlemonsters
display_name = "battlemonsters starter deck"
@@ -146,12 +146,12 @@
/datum/gear/toothpaste
display_name = "toothpaste and toothbrush"
path = /obj/item/weapon/storage/box/toothpaste
path = /obj/item/storage/box/toothpaste
/datum/gear/toothpaste/New()
..()
var/toothpaste = list()
toothpaste["toothpaste and blue toothbrush"] = /obj/item/weapon/storage/box/toothpaste
toothpaste["toothpaste and green toothbrush"] = /obj/item/weapon/storage/box/toothpaste/green
toothpaste["toothpaste and red toothbrush"] = /obj/item/weapon/storage/box/toothpaste/red
toothpaste["toothpaste and blue toothbrush"] = /obj/item/storage/box/toothpaste
toothpaste["toothpaste and green toothbrush"] = /obj/item/storage/box/toothpaste/green
toothpaste["toothpaste and red toothbrush"] = /obj/item/storage/box/toothpaste/red
gear_tweaks += new/datum/gear_tweak/path(toothpaste)

12
code/modules/client/preference_setup/loadout/loadout_smoking.dm
View File

@@ -8,24 +8,24 @@
/datum/gear/matchbook
display_name = "matchbook"
path = /obj/item/weapon/storage/box/matches
path = /obj/item/storage/box/matches
/datum/gear/zippo
display_name = "zippo"
path = /obj/item/weapon/flame/lighter/zippo
path = /obj/item/flame/lighter/zippo
/datum/gear/lighter
display_name = "cheap lighter"
path = /obj/item/weapon/flame/lighter
path = /obj/item/flame/lighter
/datum/gear/cigarcase
display_name = "cigar case"
path = /obj/item/weapon/storage/fancy/cigar
path = /obj/item/storage/fancy/cigar
/datum/gear/cigarette
display_name = "cigarette packet"
path = /obj/item/weapon/storage/fancy/cigarettes
path = /obj/item/storage/fancy/cigarettes
/datum/gear/dromedaryco
display_name = "dromedaryco cigarette packet"
path = /obj/item/weapon/storage/fancy/cigarettes/dromedaryco
path = /obj/item/storage/fancy/cigarettes/dromedaryco

34
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -1,29 +1,29 @@
/datum/gear/utility
display_name = "briefcase"
path = /obj/item/weapon/storage/briefcase
path = /obj/item/storage/briefcase
sort_category = "Utility"
/datum/gear/utility/secure
display_name = "secure briefcase"
path = /obj/item/weapon/storage/secure/briefcase
path = /obj/item/storage/secure/briefcase
cost = 2
/datum/gear/utility/clipboard
display_name = "clipboard"
path = /obj/item/weapon/clipboard
path = /obj/item/clipboard
/datum/gear/utility/folder
display_name = "folders"
path = /obj/item/weapon/folder
path = /obj/item/folder
/datum/gear/utility/folder/New()
..()
var/folders = list()
folders["blue folder"] = /obj/item/weapon/folder/blue
folders["grey folder"] = /obj/item/weapon/folder
folders["red folder"] = /obj/item/weapon/folder/red
folders["white folder"] = /obj/item/weapon/folder/white
folders["yellow folder"] = /obj/item/weapon/folder/yellow
folders["blue folder"] = /obj/item/folder/blue
folders["grey folder"] = /obj/item/folder
folders["red folder"] = /obj/item/folder/red
folders["white folder"] = /obj/item/folder/white
folders["yellow folder"] = /obj/item/folder/yellow
gear_tweaks += new/datum/gear_tweak/path(folders)
/datum/gear/utility/paicard
@@ -32,11 +32,11 @@
/datum/gear/utility/wallet
display_name = "wallet, orange"
path = /obj/item/weapon/storage/wallet
path = /obj/item/storage/wallet
/datum/gear/utility/wallet_colourable
display_name = "wallet, colourable"
path = /obj/item/weapon/storage/wallet/colourable
path = /obj/item/storage/wallet/colourable
/datum/gear/utility/wallet_colourable/New()
..()
@@ -44,7 +44,7 @@
/datum/gear/utility/wallet_purse
display_name = "wallet, purse"
path = /obj/item/weapon/storage/wallet/purse
path = /obj/item/storage/wallet/purse
/datum/gear/utility/wallet_purse/New()
..()
@@ -52,7 +52,7 @@
/datum/gear/utility/lanyard
display_name = "lanyard"
path = /obj/item/weapon/storage/wallet/lanyard
path = /obj/item/storage/wallet/lanyard
/datum/gear/utility/lanyard/New()
..()
@@ -81,18 +81,18 @@
/datum/gear/utility/fannypack
display_name = "fannypack selection"
cost = 2
path = /obj/item/weapon/storage/belt/fannypack
path = /obj/item/storage/belt/fannypack
/datum/gear/utility/fannypack/New()
..()
var/list/fannys = list()
for(var/fanny in typesof(/obj/item/weapon/storage/belt/fannypack))
var/obj/item/weapon/storage/belt/fannypack/fanny_type = fanny
for(var/fanny in typesof(/obj/item/storage/belt/fannypack))
var/obj/item/storage/belt/fannypack/fanny_type = fanny
fannys[initial(fanny_type.name)] = fanny_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(fannys))
/datum/gear/utility/toolbelt_alt
display_name = "tool-belt, alt"
cost = 0
path = /obj/item/weapon/storage/belt/utility/alt
path = /obj/item/storage/belt/utility/alt
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Roboticist")

2
code/modules/client/preference_setup/loadout/loadout_xeno/human.dm
View File

@@ -92,6 +92,6 @@
/datum/gear/offworlder_rig
display_name = "exo-stellar skeleton"
path = /obj/item/weapon/rig/light/offworlder
path = /obj/item/rig/light/offworlder
whitelisted = list("Off-Worlder Human")
sort_category = "Xenowear - Human"

2
code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
View File

@@ -46,7 +46,7 @@
/datum/gear/cape
display_name = "tunnel cloak"
path = /obj/item/weapon/storage/backpack/cloak
path = /obj/item/storage/backpack/cloak
cost = 1
whitelisted = list("Vaurca Worker", "Vaurca Warrior")
sort_category = "Xenowear - Vaurca"