cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 03:27:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Guns, Coats, and Hair Oh My

Browse Source 
Hair gender fix, the attack of the multicolor labcoats and hoodies, and
the addition of a new SMG E-Gun.
This commit is contained in:
SinTwo
2015-09-03 19:51:26 -04:00
parent 067bfc0de5
commit 4e360779ed
11 changed files with 127 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/labcoat.dm
+16
View File
@@ -51,6 +51,22 @@
icon_open = "green_labcoat_open"
icon_closed = "green_labcoat"
/obj/item/clothing/suit/storage/toggle/labcoat/yellow
name = "yellow labcoat"
desc = "A suit that protects against minor chemical spills. This one is yellow."
icon_state = "yellow_labcoat_open"
item_state = "yellow_labcoat"
icon_open = "yellow_labcoat_open"
icon_closed = "yellow_labcoat"
/obj/item/clothing/suit/storage/toggle/labcoat/pink
name = "pink labcoat"
desc = "A suit that protects against minor chemical spills. This one is pink."
icon_state = "pink_labcoat_open"
item_state = "pink_labcoat"
icon_open = "pink_labcoat_open"
icon_closed = "pink_labcoat"
/obj/item/clothing/suit/storage/toggle/labcoat/cmo
name = "chief medical officer's labcoat"
desc = "Bluer than the standard model."
code/modules/clothing/suits/miscellaneous.dm
+43 -3
View File
@@ -357,7 +357,7 @@
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/leather_jacket/nanotrasen
desc = "A black leather coat. The letters NT are proudly displayed on the back."
desc = "A black leather coat. A corporate logo is proudly displayed on the back."
icon_state = "leather_jacket_nt"
//This one has buttons for some reason
@@ -371,7 +371,7 @@
body_parts_covered = UPPER_TORSO|ARMS
/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
desc = "A brown leather coat. The letters NT are proudly displayed on the back."
desc = "A brown leather coat. A corporate logo is proudly displayed on the back."
icon_state = "brown_jacket_nt"
icon_open = "brown_jacket_nt_open"
icon_closed = "brown_jacket_nt"
@@ -392,4 +392,44 @@
icon_state = "black_hoodie"
item_state = "black_hoodie"
icon_open = "black_hoodie_open"
icon_closed = "black_hoodie"
icon_closed = "black_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/red
name = "red hoodie"
desc = "A warm, red sweatshirt."
icon_state = "red_hoodie"
item_state = "red_hoodie"
icon_open = "red_hoodie_open"
icon_closed = "red_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/blue
name = "blue hoodie"
desc = "A warm, blue sweatshirt."
icon_state = "blue_hoodie"
item_state = "blue_hoodie"
icon_open = "blue_hoodie_open"
icon_closed = "blue_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/green
name = "green hoodie"
desc = "A warm, green sweatshirt."
icon_state = "green_hoodie"
item_state = "green_hoodie"
icon_open = "green_hoodie_open"
icon_closed = "green_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/orange
name = "orange hoodie"
desc = "A warm, orange sweatshirt."
icon_state = "orange_hoodie"
item_state = "orange_hoodie"
icon_open = "orange_hoodie_open"
icon_closed = "orange_hoodie"
/obj/item/clothing/suit/storage/toggle/hoodie/yellow
name = "yellow hoodie"
desc = "A warm, yellow sweatshirt."
icon_state = "yellow_hoodie"
item_state = "yellow_hoodie"
icon_open = "yellow_hoodie_open"
icon_closed = "yellow_hoodie"
code/modules/mob/new_player/sprite_accessories.dm
+11 -42
View File
@@ -112,7 +112,6 @@
ponytail2
name = "Ponytail 2"
icon_state = "hair_pa"
gender = FEMALE
ponytail3
name = "Ponytail 3"
@@ -121,12 +120,14 @@
ponytail4
name = "Ponytail 4"
icon_state = "hair_ponytail4"
gender = FEMALE
ponytail4
name = "Ponytail 5"
icon_state = "hair_ponytail5"
sideponytail
name = "Side Ponytail"
icon_state = "hair_stail"
gender = FEMALE
parted
name = "Parted"
@@ -135,12 +136,10 @@
pompadour
name = "Pompadour"
icon_state = "hair_pompadour"
gender = MALE
quiff
name = "Quiff"
icon_state = "hair_quiff"
gender = MALE
bedhead
name = "Bedhead"
@@ -157,55 +156,45 @@
beehive
name = "Beehive"
icon_state = "hair_beehive"
gender = FEMALE
beehive2
name = "Beehive 2"
icon_state = "hair_beehive2"
gender = FEMALE
bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
gender = FEMALE
species_allowed = list("Human","Unathi")
bob
name = "Bob"
icon_state = "hair_bobcut"
gender = FEMALE
species_allowed = list("Human","Unathi")
bowl
name = "Bowl"
icon_state = "hair_bowlcut"
gender = MALE
buzz
name = "Buzzcut"
icon_state = "hair_buzzcut"
gender = MALE
species_allowed = list("Human","Unathi")
crew
name = "Crewcut"
icon_state = "hair_crewcut"
gender = MALE
combover
name = "Combover"
icon_state = "hair_combover"
gender = MALE
father
name = "Father"
icon_state = "hair_father"
gender = MALE
reversemohawk
name = "Reverse Mohawk"
icon_state = "hair_reversemohawk"
gender = MALE
devillock
name = "Devil Lock"
@@ -230,12 +219,10 @@
afro_large
name = "Big Afro"
icon_state = "hair_bigafro"
gender = MALE
sargeant
name = "Flat Top"
icon_state = "hair_sargeant"
gender = MALE
emo
name = "Emo"
@@ -244,7 +231,10 @@
longemo
name = "Long Emo"
icon_state = "hair_emolong"
gender = FEMALE
veryshortovereye
name = "Overeye Very Short"
icon_state = "hair_veryshortovereye"
shortovereye
name = "Overeye Short"
@@ -265,31 +255,29 @@
hitop
name = "Hitop"
icon_state = "hair_hitop"
gender = MALE
mohawk
name = "Mohawk"
icon_state = "hair_d"
species_allowed = list("Human","Unathi")
jensen
name = "Adam Jensen Hair"
icon_state = "hair_jensen"
gender = MALE
gelled
name = "Gelled Back"
icon_state = "hair_gelled"
gender = FEMALE
gentle
name = "Gentle"
icon_state = "hair_gentle"
gender = FEMALE
spiky
name = "Spiky"
icon_state = "hair_spikey"
species_allowed = list("Human","Unathi")
kusangi
name = "Kusanagi Hair"
icon_state = "hair_kusanagi"
@@ -297,42 +285,34 @@
kagami
name = "Pigtails"
icon_state = "hair_kagami"
gender = FEMALE
himecut
name = "Hime Cut"
icon_state = "hair_himecut"
gender = FEMALE
braid
name = "Floorlength Braid"
icon_state = "hair_braid"
gender = FEMALE
icon_state = "bald" //Trust me, it's better this way.
mbraid
name = "Medium Braid"
icon_state = "hair_shortbraid"
gender = FEMALE
braid2
name = "Long Braid"
icon_state = "hair_hbraid"
gender = FEMALE
odango
name = "Odango"
icon_state = "hair_odango"
gender = FEMALE
ombre
name = "Ombre"
icon_state = "hair_ombre"
gender = FEMALE
updo
name = "Updo"
icon_state = "hair_updo"
gender = FEMALE
skinhead
name = "Skinhead"
@@ -346,57 +326,46 @@
familyman
name = "The Family Man"
icon_state = "hair_thefamilyman"
gender = MALE
mahdrills
name = "Drillruru"
icon_state = "hair_drillruru"
gender = FEMALE
dandypomp
name = "Dandy Pompadour"
icon_state = "hair_dandypompadour"
gender = MALE
poofy
name = "Poofy"
icon_state = "hair_poofy"
gender = FEMALE
crono
name = "Chrono"
icon_state = "hair_toriyama"
gender = MALE
vegeta
name = "Vegeta"
icon_state = "hair_toriyama2"
gender = MALE
cia
name = "CIA"
icon_state = "hair_cia"
gender = MALE
mulder
name = "Mulder"
icon_state = "hair_mulder"
gender = MALE
scully
name = "Scully"
icon_state = "hair_scully"
gender = FEMALE
nitori
name = "Nitori"
icon_state = "hair_nitori"
gender = FEMALE
joestar
name = "Joestar"
icon_state = "hair_joestar"
gender = MALE
bald
name = "Bald"
code/modules/projectiles/guns/energy/nuclear.dm
+25 -5
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/energy/gun
name = "energy gun"
desc = "An energy-based gun with two settings: Stun and kill."
desc = "Another bestseller of Lawson Arms and the FTU, the LAEP90 Perun is a versatile energy based sidearm, capable of switching between low and high capacity projectile settings. In other words: Stun or Kill."
icon_state = "energystun100"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
@@ -20,21 +20,41 @@
self_recharge = 1
use_external_power = 1
/obj/item/weapon/gun/energy/gun
name = "fm-2t"
desc = "The FM-2t is a versatile energy based small arm, capable of switching between stun or kill with a three round burst option for both settings."
icon_state = "fm-2tstun100"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
max_shots = 12
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_ILLEGAL = 3)
modifystate = "fm-2tstun"
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="fm-2tstun", fire_sound='sound/weapons/Taser.ogg'),
list(name="stun 3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0), projectile_type=/obj/item/projectile/beam/stun, modifystate="fm-2tstun", fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="fm-2tkill", fire_sound='sound/weapons/Laser.ogg'),
list(name="lethal 3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0), projectile_type=/obj/item/projectile/beam, modifystate="fm-2tkill", fire_sound='sound/weapons/Laser.ogg'),
)
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized reactor."
icon_state = "nucgun"
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_POWER = 3)
slot_flags = SLOT_BELT
force = 8 //looks heavier than a pistol
force = 8 //looks heavier than a pistol
self_recharge = 1
modifystate = null
firemodes = list(
list(name="stun", projectile_type=/obj/item/projectile/beam/stun, fire_sound='sound/weapons/Taser.ogg'),
list(name="lethal", projectile_type=/obj/item/projectile/beam, fire_sound='sound/weapons/Laser.ogg'),
)
var/lightfail = 0
//override for failcheck behaviour
code/modules/projectiles/guns/projectile/automatic.dm
+32 -34
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/projectile/automatic //Hopefully someone will find a way to make these fire in bursts or something. --Superxpdude
name = "submachine gun"
desc = "A lightweight, fast firing gun. Uses 9mm rounds."
name = "prototype SMG"
desc = "A protoype lightweight, fast firing gun. Uses 9mm rounds."
icon_state = "saber" //ugly
w_class = 3
load_method = SPEEDLOADER //yup. until someone sprites a magazine for it.
@@ -10,16 +10,16 @@
slot_flags = SLOT_BELT
ammo_type = /obj/item/ammo_casing/c9mm
multi_aim = 1
burst_delay = 2
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 1.0)),
list(name="short bursts", burst=5, move_delay=4, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
list(name="short bursts", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,-1,-1,-2,-2), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)),
)
/obj/item/weapon/gun/projectile/automatic/mini_uzi
name = "\improper Uzi"
desc = "A lightweight, fast firing gun, for when you want someone dead. Uses .45 rounds."
desc = "The UZI is a lightweight, fast firing gun. For when you want someone dead. Uses .45 rounds."
icon_state = "mini-uzi"
w_class = 3
load_method = SPEEDLOADER //yup. until someone sprites a magazine for it.
@@ -29,8 +29,8 @@
ammo_type = /obj/item/ammo_casing/c45
/obj/item/weapon/gun/projectile/automatic/c20r
name = "\improper C-20r SMG"
desc = "A lightweight, fast firing gun, for when you REALLY need someone dead. Uses 12mm pistol rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp"
name = "submachine gun"
desc = "The C-20r is a lightweight and rapid firing SMG, for when you REALLY need someone dead. Uses 12mm rounds. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
icon_state = "c20r"
item_state = "c20r"
w_class = 3
@@ -53,8 +53,8 @@
return
/obj/item/weapon/gun/projectile/automatic/sts35
name = "\improper STS-35 automatic rifle"
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. It is unmarked."
name = "assault rifle"
desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 7.62mm rounds. This one is unmarked."
icon_state = "arifle"
item_state = null
w_class = 4
@@ -66,9 +66,9 @@
magazine_type = /obj/item/ammo_magazine/c762
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.0, 0.6, 0.6)),
list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-1,-2), dispersion=list(0.0, 0.6, 0.6)),
list(name="short bursts", burst=5, fire_delay=null, move_delay=6, burst_accuracy=list(0,-1,-2,-2,-3), dispersion=list(0.6, 1.0, 1.0, 1.0, 1.2)),
)
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon()
@@ -77,8 +77,8 @@
update_held_icon()
/obj/item/weapon/gun/projectile/automatic/wt550
name = "\improper W-T 550 Saber"
desc = "A cheap, mass produced Ward-Takahashi PDW. Uses 9mm rounds."
name = "machine pistol"
desc = "The W-T 550 Saber is a cheap self-defense weapon, mass-produced by Ward-Takahashi for paramilitary and private use. Uses 9mm rounds."
icon_state = "wt550"
item_state = "wt550"
w_class = 3
@@ -98,12 +98,9 @@
icon_state = "wt550"
return
/datum/firemode/z8
var/use_launcher = 0
/obj/item/weapon/gun/projectile/automatic/z8
name = "\improper Z8 Bulldog"
desc = "An older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
name = "bullpup assault rifle"
desc = "The Z8 Bulldog is an older model bullpup carbine, made by the now defunct Zendai Foundries. Uses armor piercing 5.56mm rounds. Makes you feel like a space marine when you hold it."
icon_state = "carbine"
item_state = "z8carbine"
w_class = 4
@@ -119,13 +116,13 @@
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
burst_delay = 4
firemode_type = /datum/firemode/z8
firemodes = list(
list(name="semiauto", burst=1, fire_delay=0),
list(name="3-round bursts", burst=3, move_delay=6, accuracy = list(0,-1,-1), dispersion = list(0.0, 0.6, 0.6)),
list(name="fire grenades", use_launcher=1)
list(name="semiauto", burst=1, fire_delay=0, move_delay=null, use_launcher=null, burst_accuracy=null, dispersion=null),
list(name="3-round bursts", burst=3, fire_delay=null, move_delay=6, use_launcher=null, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 0.6)),
list(name="fire grenades", burst=null, fire_delay=null, move_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null)
)
var/use_launcher = 0
var/obj/item/weapon/gun/launcher/grenade/underslung/launcher
/obj/item/weapon/gun/projectile/automatic/z8/New()
@@ -139,15 +136,13 @@
..()
/obj/item/weapon/gun/projectile/automatic/z8/attack_hand(mob/user)
var/datum/firemode/z8/current_mode = firemodes[sel_mode]
if(user.get_inactive_hand() == src && current_mode.use_launcher)
if(user.get_inactive_hand() == src && use_launcher)
launcher.unload(user)
else
..()
/obj/item/weapon/gun/projectile/automatic/z8/Fire(atom/target, mob/living/user, params, pointblank=0, reflex=0)
var/datum/firemode/z8/current_mode = firemodes[sel_mode]
if(current_mode.use_launcher)
if(use_launcher)
launcher.Fire(target, user, params, pointblank, reflex)
if(!launcher.chambered)
switch_firemodes() //switch back automatically
@@ -170,8 +165,8 @@
user << "\The [launcher] is empty."
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "\improper L6 SAW"
desc = "A rather traditionally made light machine gun with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever"
name = "light machine gun"
desc = "A rather traditionally made L6 SAW with a pleasantly lacquered wooden pistol grip. Has 'Aussec Armoury- 2531' engraved on the reciever"
icon_state = "l6closed100"
item_state = "l6closedmag"
w_class = 4
@@ -187,8 +182,8 @@
magazine_type = /obj/item/ammo_magazine/a762
firemodes = list(
list(name="short bursts", burst=5, move_delay=6, accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="long bursts", burst=8, move_delay=8, accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
list(name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(name="long bursts", burst=8, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2,-2,-3,-3), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)),
)
var/cover_open = 0
@@ -235,7 +230,7 @@
name = "\improper AS-24 automatic shotgun"
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
icon_state = "ashot"
item_state = "arifle"
item_state = null
w_class = 4
force = 10
caliber = "shotgun"
@@ -257,3 +252,6 @@
else
icon_state = "ashot"
return