mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 15:01:04 +01:00
Gun, sword and janitor ert additions (#2142)
-changes the one handed pulse rifle to be a pulse carbine and a pulse pistol, also removed a lot of useless vars from it -changed the pulse destroyer to fire in bursts -added some new flavors of sword with their own sprites -added some new on hand and back sprites for some guns -added the janitor ert hardsuit, not anywhere yet -fix #2137 -fix the anesthetic tank having no sprite on the back -ghetto shotgun and pistol chances of failure are now random when they are created
This commit is contained in:
@@ -523,8 +523,7 @@
|
||||
/obj/item/weapon/melee/baton/stunrod,
|
||||
/obj/item/weapon/material/harpoon,
|
||||
/obj/item/weapon/material/twohanded/spear/plasteel,
|
||||
/obj/item/weapon/material/sword/trench,
|
||||
/obj/item/weapon/material/sword/rapier,
|
||||
/obj/random/sword,
|
||||
/obj/item/weapon/melee/hammer,
|
||||
/obj/item/weapon/material/twohanded/fireaxe,
|
||||
/obj/item/weapon/melee/classic_baton
|
||||
@@ -752,7 +751,7 @@
|
||||
/obj/item/clothing/suit/armor/reactive = 0.5,
|
||||
/obj/item/clothing/glasses/thermal = 0.5,
|
||||
/obj/item/weapon/gun/projectile/automatic/rifle/shotgun = 0.5,
|
||||
/obj/item/weapon/material/sword/rapier = 0.5,
|
||||
/obj/random/sword = 0.5,
|
||||
/obj/item/weapon/gun/energy/lawgiver = 0.5,
|
||||
/obj/item/weapon/melee/energy/axe = 0.5,
|
||||
/obj/item/weapon/gun/projectile/automatic/terminator = 0.5,
|
||||
@@ -773,3 +772,21 @@
|
||||
spawnlist = list(
|
||||
/obj/structure/reagent_dispensers/cookingoil
|
||||
)
|
||||
|
||||
/obj/random/sword
|
||||
name = "random sword"
|
||||
desc = "This is a random sword."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "claymore"
|
||||
spawnlist = list(
|
||||
/obj/item/weapon/material/sword,
|
||||
/obj/item/weapon/material/sword/katana,
|
||||
/obj/item/weapon/material/sword/rapier,
|
||||
/obj/item/weapon/material/sword/longsword,
|
||||
/obj/item/weapon/material/sword/trench,
|
||||
/obj/item/weapon/material/sword/sabre,
|
||||
/obj/item/weapon/material/sword/axe,
|
||||
/obj/item/weapon/material/sword/khopesh,
|
||||
/obj/item/weapon/material/sword/dao,
|
||||
/obj/item/weapon/material/sword/gladius
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user