cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

guns and other things

Browse Source
This commit is contained in:
Kelshark
2016-12-17 14:09:44 -05:00
parent a21e10f79a
commit 26ce56cda9
11 changed files with 108 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/playsound.dm
View File

@@ -5,7 +5,7 @@ var/list/sounds_cache = list()
set name = "Play Global Sound"
if(!check_rights(R_SOUNDS)) return
var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777)
var/sound/uploaded_sound = sound(S, volume = 50, repeat = 0, wait = 1, channel = 777)
uploaded_sound.priority = 250
sounds_cache += S

4
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -31,8 +31,8 @@ var/datum/species/shapeshifter/promethean/prometheans
// gluttonous = 2 // Vorestation edit. Redundant feature.
virus_immune = 1
blood_volume = 600
min_age = 1
max_age = 5
min_age = 18
max_age = 80
brute_mod = 0.5
burn_mod = 2
oxy_mod = 0

2
code/modules/mob/living/carbon/human/species/station/seromi.dm
View File

@@ -9,7 +9,7 @@
num_alternate_languages = 2
secondary_langs = list("Schechi", "Skrellian")
name_language = "Schechi"
min_age = 12
min_age = 18
max_age = 45
health_hud_intensity = 3

10
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -11,7 +11,7 @@
num_alternate_languages = 2
secondary_langs = list("Sol Common")
name_language = null // Use the first-name last-name generator rather than a language scrambler
min_age = 17
min_age = 18
max_age = 110
health_hud_intensity = 1.5
@@ -40,7 +40,7 @@
name_language = "Sinta'unathi"
health_hud_intensity = 2.5
min_age = 17
min_age = 18
max_age = 110
blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \
@@ -101,7 +101,7 @@
name_language = "Siik"
health_hud_intensity = 2.5
min_age = 17
min_age = 18
max_age = 110
blurb = "The Tajaran are a mammalian species resembling roughly felines, hailing from Meralar in the Rarkajar system. \
@@ -156,7 +156,7 @@
name_language = "Skrellian"
health_hud_intensity = 2
min_age = 17
min_age = 18
max_age = 110
darksight = 4
@@ -209,7 +209,7 @@
name_language = "Rootspeak"
health_hud_intensity = 2.5
min_age = 1
min_age = 18
max_age = 300
blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \

14
code/modules/mob/living/carbon/human/species/station/station_vr.dm
View File

@@ -16,7 +16,7 @@
name_language = "Sagaru"
color_mult = 1
min_age = 17
min_age = 18
max_age = 110
blurb = "There are two subspecies of Sergal; Southern and Northern. Northern sergals are a highly aggressive race \
@@ -62,7 +62,7 @@
name_language = "Skrellian"
color_mult = 1
min_age = 17
min_age = 18
max_age = 110
blurb = "The Akula are a species of amphibious humanoids like the Skrell, but have an appearance very similar to that of a shark. \
@@ -101,7 +101,7 @@
name_language = "Birdsong"
color_mult = 1
min_age = 17
min_age = 18
max_age = 110
blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, \
@@ -138,7 +138,7 @@
secondary_langs = list("Siik'tajr")
name_language = "Siik'tajr"
min_age = 17
min_age = 18
max_age = 110
blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \
@@ -183,7 +183,7 @@
secondary_langs = list("Siik'tajr")
name_language = "Siik'tajr"
min_age = 17
min_age = 18
max_age = 110
blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \
@@ -249,7 +249,7 @@
flesh_color = "#966464"
base_color = "#B43214"
min_age = 17
min_age = 18
max_age = 110
/datum/species/xenohybrid
@@ -264,7 +264,7 @@
hunger_factor = 0.1 //In exchange, they get hungry a tad faster.
num_alternate_languages = 2
min_age = 17
min_age = 18
max_age = 110
blurb = "Xenomorphs hybrids are a mixture of xenomorph DNA and some other humanoid species. \

59
code/modules/projectiles/ammunition/boxes_yw.dm Normal file
View File

@@ -0,0 +1,59 @@
/********m2024 .45********/
/obj/item/ammo_magazine/c45m2024
name = "m2024 pistol magazine (.45)"
icon_state = "45"
icon = 'icons/obj/gun_yw.dmi'
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 7
multiple_sprites = 1
/obj/item/ammo_magazine/c45m2024/empty
initial_ammo = 0
/obj/item/ammo_magazine/c45m2024/rubber
name = "m2024 magazine (.45 rubber)"
ammo_type = /obj/item/ammo_casing/c45r
/obj/item/ammo_magazine/c45m2024/practice
name = "m2024 magazine (.45 practice)"
ammo_type = /obj/item/ammo_casing/c45p
/obj/item/ammo_magazine/c45m2024/flash
name = "m2024 magazine (.45 flash)"
ammo_type = /obj/item/ammo_casing/c45f
/obj/item/ammo_magazine/c45m2024/ap
name = "m2024 magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/c45ap
/******** 9mm glock ********/
/obj/item/ammo_magazine/gl9mm
name = "glock magazine (9mm)"
icon_state = "glock-mag"
icon = 'icons/obj/gun_yw.dmi'
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
matter = list(DEFAULT_WALL_MATERIAL = 480)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
max_ammo = 17
multiple_sprites = 0
/obj/item/ammo_magazine/gl9mm/empty
initial_ammo = 0
/obj/item/ammo_magazine/gl9mm/flash
ammo_type = /obj/item/ammo_casing/c9mmf
/obj/item/ammo_magazine/gl9mm/rubber
name = "glock magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
/obj/item/ammo_magazine/gl9mm/practice
name = "glock magazine (9mm practice)"
ammo_type = /obj/item/ammo_casing/c9mmp

10
code/modules/projectiles/guns/energy/nuclear_yw.dm
View File

@@ -1,7 +1,7 @@
/obj/item/weapon/gun/energy/las
/obj/item/weapon/gun/energy/sf2000
name = "SF 2000"
desc = "A oddly shaped red colored energy gun, can fire both stun and lethal lasers"
icon_state = "lasstun"
icon_state = "lasgunstun"
icon = 'icons/obj/gun_yw.dmi'
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser.ogg'
@@ -9,9 +9,9 @@
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
modifystate = "energystun"
modifystate = "lasgunstun"
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="lasstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="laskill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="lasgunstun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 240),
list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="lasgunkill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 480),
)

23
code/modules/projectiles/guns/projectile/pistol_yw.dm
View File

@@ -1,5 +1,4 @@
/******GLOCK******/
/*****************/
/obj/item/weapon/gun/projectile/automatic/glock
name = "Glock G18"
desc = "A automatic handgun that uses .9mm rounds."
@@ -26,7 +25,6 @@
/*******PPK*******/
/*****************/
/obj/item/weapon/gun/projectile/ppk
name = "PPK"
desc = "A handgun that uses .9mm rounds."
@@ -46,4 +44,23 @@
else
icon_state = "[initial(icon_state)]-empty"
/**/
/*******M2024*******/
/obj/item/weapon/gun/projectile/m2024
name = "Custom M2024"
desc = "Customized model of old yet reliable sol .45 handgun with the name 'M2024'. Used to be popular, still appreciated for it's effectiveness."
icon_state = "m2024"
item_state = "m2024"
icon = 'icons/obj/gun_yw.dmi'
caliber = ".45"
load_method = MAGAZINE
fire_sound = 'sound/weapons/semiauto.ogg'
magazine_type = /obj/item/ammo_magazine/c45m2024
allowed_magazines = list(/obj/item/ammo_magazine/c45m2024,/obj/item/ammo_magazine/c45m)
/obj/item/weapon/gun/projectile/m2024/update_icon()
..()
if(ammo_magazine)
icon_state = "[initial(icon_state)]"
else
icon_state = "[initial(icon_state)]-empty"

6
code/modules/projectiles/guns/projectile/revolver_yw.dm Normal file
View File

@@ -0,0 +1,6 @@
/obj/item/weapon/gun/projectile/revolver/nova
name = "Nova"
desc = "Heavily modified revolver, with alas only 6 round chamber but fiery firepower of 357 calibre. Make it count. Uses .357 rounds." // Yes I'm serious. -Spades
icon_state = "nova"
icon = 'icons/obj/gun_yw.dmi'
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)

BIN
icons/obj/gun_yw.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

2
vorestation.dme
View File

@@ -1909,6 +1909,7 @@
#include "code\modules\projectiles\gun.dm"
#include "code\modules\projectiles\projectile.dm"
#include "code\modules\projectiles\ammunition\boxes.dm"
#include "code\modules\projectiles\ammunition\boxes_yw.dm"
#include "code\modules\projectiles\ammunition\bullets.dm"
#include "code\modules\projectiles\guns\alien.dm"
#include "code\modules\projectiles\guns\energy.dm"
@@ -1933,6 +1934,7 @@
#include "code\modules\projectiles\guns\projectile\pistol.dm"
#include "code\modules\projectiles\guns\projectile\pistol_yw.dm"
#include "code\modules\projectiles\guns\projectile\revolver.dm"
#include "code\modules\projectiles\guns\projectile\revolver_yw.dm"
#include "code\modules\projectiles\guns\projectile\shotgun.dm"
#include "code\modules\projectiles\guns\projectile\sniper.dm"
#include "code\modules\projectiles\guns\projectile\sniper_vr.dm"