Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scarborough Cargo Typos #2912

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define iskepori(A) (is_species(A, /datum/species/kepori))
#define isipc(A) (is_species(A, /datum/species/ipc))
#define isspiderperson(A) (is_species(A, /datum/species/spider))
#define isvox(A) (is_species(A, /datum/species/vox))

//more carbon mobs
#define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
Expand Down
14 changes: 7 additions & 7 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@
crate_name = "disposable gun crate"

/datum/supply_pack/gun/commanders
name = "Commander pistol crate"
name = "Commander Pistol Crate"
desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
cost = 750
contains = list(/obj/item/gun/ballistic/automatic/pistol/commander)

/datum/supply_pack/gun/makarovs
name = "Stechkin pistol crate"
name = "Stechkin Pistol Crate"
desc = "Contains a concealable stechkin pistol, produced by Scarborough Arms and chambered in 10mm."
cost = 1000
contains = list(/obj/item/gun/ballistic/automatic/pistol,
/obj/item/gun/ballistic/automatic/pistol)

/datum/supply_pack/gun/revolver
name = "Scarbourgh Revolver crate"
desc = "Contains a concealable Scarbourgh revolver, chambered in .357."
name = "Scarborough Revolver Crate"
desc = "Contains a concealable Scarborough revolver, chambered in .357."
cost = 1250
contains = list(/obj/item/gun/ballistic/revolver)

/datum/supply_pack/gun/detrevolver
name = "Hunter's Pride Detective Revolver crate"
name = "Hunter's Pride Detective Revolver Crate"
desc = "Contains a concealable Solarian revolver, chambered in .38."
cost = 1000
contains = list(/obj/item/gun/ballistic/revolver/detective)

/datum/supply_pack/gun/shadowrevolver
name = "Shadow Revolver crate"
name = "Shadow Revolver Crate"
desc = "Contains a concealable Shadow revolver, chambered in .45 ACP."
cost = 1000
contains = list(/obj/item/gun/ballistic/revolver/shadow)
Expand Down Expand Up @@ -128,7 +128,7 @@

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45"
desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
cost = 3000
contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
crate_name = "SMG crate"
Expand Down
35 changes: 33 additions & 2 deletions code/modules/mob/living/carbon/human/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
if(islizard(user))
return 'sound/voice/lizard/squeal.ogg' //This is from Bay

/datum/emote/living/carbon/human/tailthump //lizard
/datum/emote/living/carbon/human/tailthump //lizard + vox
key = "thump"
key_third_person = "thumps their tail"
message = "thumps their tail!"
Expand All @@ -106,7 +106,7 @@
/datum/emote/living/carbon/human/tailthump/get_sound(mob/living/user)
if(!ishuman(user))
return
if(islizard(user))
if(islizard(user) || (isvox(user)))
return 'sound/voice/lizard/tailthump.ogg' //https://freesound.org/people/TylerAM/sounds/389665/

/datum/emote/living/carbon/human/weh //lizard
Expand Down Expand Up @@ -317,3 +317,34 @@
/datum/emote/living/carbon/human/robot_tongue/sad/run_emote(mob/user, params)
if(..())
playsound(user.loc, 'sound/misc/sadtrombone.ogg', 50)

//kepi (plus one vox i guess)

/datum/emote/living/carbon/human/kepiclick
key = "click"
key_third_person = "clicks"
message = "clicks."
emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/human/kepiclick/get_sound(mob/living/user)
if(!ishuman(user))
return
if(iskepori(user) || (isvox(user)))
return 'sound/voice/kepori/kepiclick.ogg' //https://freesound.org/people/Ambiabstract/sounds/584212/

/datum/emote/living/carbon/human/kepiwhistle
key = "whistle"
key_third_person = "whistles"
message = "whistles!"
emote_type = EMOTE_AUDIBLE

/datum/emote/living/carbon/human/kepiwhistle/get_sound(mob/living/user)
if(!ishuman(user))
return
if(iskepori(user))
return 'sound/voice/kepori/kepiwhistle.ogg' //https://freesound.org/people/Andreas.Mustola/sounds/338277/

/datum/emote/living/carbon/human/kepiwoop // i have yet to find a woop sound that doesnt suck i will do it later
key = "woop"
key_third_person = "woops"
message = "woops!"
Binary file added sound/voice/kepori/kepiclick.ogg
Binary file not shown.
Binary file added sound/voice/kepori/kepiwhistle.ogg
Binary file not shown.
Loading