cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into FabAdditions

Browse Source
This commit is contained in:
LordSaladin
2022-07-23 17:48:08 +01:00
committed by GitHub
parent bdfb0776ac 17068132ed
commit edcbbcd7ad
9 changed files with 772 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -157,9 +157,11 @@ var/list/_human_default_emotes = list(
/decl/emote/audible/zoom,
/decl/emote/audible/mothscream,
/decl/emote/audible/mothchitter,
/decl/emote/audible/mothlaugh
/decl/emote/audible/mothlaugh,
//VOREStation Add End
//CHOMP Add start
/decl/emote/audible/prbt2
//CHOMP Add end
)
//VOREStation Add Start
@@ -299,8 +301,10 @@ var/list/_simple_mob_default_emotes = list(
/decl/emote/audible/warble,
/decl/emote/audible/vox_shriek,
/decl/emote/audible/purr,
/decl/emote/audible/purrlong
/decl/emote/audible/purrlong,
//CHOMP Add start
/decl/emote/audible/prbt2
//CHOMP Add end
)
//VOREStation Add End

2
code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
View File

@@ -175,7 +175,7 @@
/mob/living/simple_mob/humanoid/merc/ranged/smg/sol
icon_state = "bluforranged_smg"
icon_living = "blueforranged_smg"
icon_living = "bluforranged_smg" //CHOMPEdit - Fixes typo that makes smg mercs invis sometimes
corpse = /obj/effect/landmark/mobcorpse/solarpeacekeeper
loot_list = list(/obj/item/weapon/gun/projectile/automatic/c20r = 100)

717
config/jukebox.json
View File

@@ -3969,5 +3969,722 @@
"lobby": false,
"jukebox": true,
"genre": "Electronic"
},
{
"url": "https://files.catbox.moe/3h38kn.mp3",
"title": "Among Us",
"duration": 720,
"genre": "Disco, Funk, Soul, and R&B",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/rqhxj1.mp3",
"title": "Leggy Zone",
"duration": 1470,
"genre": "Electronic",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/e6l6mw.mp3",
"title": "Shop Theme",
"duration": 8910,
"genre": "Electronic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/q2ob3n.mp3",
"title": "PONPONPON",
"duration": 2430,
"artist": "Kyary Pamyu Pamyu",
"genre": "J-Pop",
"secret": false,
"lobby": false
},
{
"url": "https://files.catbox.moe/o8flhu.mp3",
"title": "Man's Road",
"duration": 2060,
"artist": "America",
"genre": "Rock",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/0gb5qs.mp3",
"title": "Passionflower",
"duration": 3840,
"artist": "Jon Gomm",
"genre": "Rock",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/p5e28z.mp3",
"title": "What the Fuck",
"duration": 2420,
"artist": "Koh",
"genre": "Folk and Indie",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/0f2xma.mp3",
"title": "Bonetrousle",
"duration": 580,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/6ivc7w.mp3",
"title": "Bury the Light",
"duration": 5830,
"artist": "Victor Borba & Casey Edwards",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/pbtbjv.mp3",
"title": "Dog Song",
"duration": 380,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/4v3eeb.mp3",
"title": "Anticipation",
"duration": 230,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/0q8ch6.mp3",
"title": "Smash Clown",
"duration": 820,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ygcg2e.mp3",
"title": "Honk The Police",
"duration": 590,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/h0yswi.mp3",
"title": "Cargonia",
"duration": 630,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/xg76ja.mp3",
"title": "Hail Cargonia",
"duration": 980,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/tbr2rc.mp3",
"title": "Banned From Cargo",
"duration": 2450,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/tw2et2.mp3",
"title": "Periphery Dixie",
"duration": 1200,
"artist": "Goat",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/rm5hcs.mp3",
"title": "Cargonia (cover)",
"duration": 2730,
"artist": "Dadbot5000",
"genre": "Space",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ybfof9.mp3",
"title": "The Legend",
"duration": 1120,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ugfx06.mp3",
"title": "Field of Hopes and Dreams",
"duration": 1610,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/wr08om.mp3",
"title": "Checker Dance",
"duration": 780,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/4au954.mp3",
"title": "Vs Susie",
"duration": 810,
"artist": "Toby Fox",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/c9y5x2.mp3",
"title": "Golden Wind",
"duration": 2930,
"artist": "Yugo Kanno",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ymvtem.mp3",
"title": "Sono Chi no Sadame",
"duration": 2610,
"artist": "Hiroaki TOMMY Tominaga",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/z73u05.mp3",
"title": "Bloody Stream",
"duration": 2590,
"artist": "Coda",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/yg3643.mp3",
"title": "Stand Proud",
"duration": 2750,
"artist": "Jin Hashimoto",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/344qrf.mp3",
"title": "Sono Chi no Kioku ~end of THE WORLD~",
"duration": 2620,
"artist": "JO☆STARS",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/0n6y6v.mp3",
"title": "Crazy Noisy Bizarre Town",
"duration": 1840,
"artist": "THE DU",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/j3xzw6.mp3",
"title": "Chase",
"duration": 1450,
"artist": "Batta",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/luf1bh.mp3",
"title": "Great Days",
"duration": 2400,
"artist": "Karen Aoki & Daisuke Hasegaw",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ytp4d2.mp3",
"title": "Fighting Gold",
"duration": 2540,
"artist": "Coda",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/q1xjdp.mp3",
"title": "I Want It That Way",
"duration": 2120,
"artist": "Backstreet Boys",
"genre": "Pop",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/pxpkat.mp3",
"title": "Shop Theme Cover",
"duration": 1770,
"artist": "Songe",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/nz03o1.mp3",
"title": "Deep Space 9 (Cover)",
"duration": 1220,
"artist": "Heropoint",
"genre": "Rock",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/n4vcnq.mp3",
"title": "Trouble Shooting Star",
"duration": 1460,
"artist": "",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/byy378.mp3",
"title": "The Lord of the Rings The Fellowship of the its my book they will walk if I tell them to",
"duration": 970,
"artist": "Tom Cardy",
"genre": "Folk and Indie",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/akgbup.mp3",
"title": "Flight of the Bumblebee",
"duration": 2050,
"artist": "Rimsky Korsakov",
"genre": "Classical and Orchestral",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/milk8o.mp3",
"title": "As Heaven Is Wide",
"duration": 2880,
"artist": "Garbage",
"genre": "Rock",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/8mh82l.mp3",
"title": "Combat Montage",
"duration": 1410,
"artist": "Kevin Manthei",
"genre": "Rock",
"secret": true,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/qa6ahi.mp3",
"title": "Deadlines",
"duration": 1570,
"artist": "Network Music Ensemble",
"genre": "Rock",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/cdmm5k.mp3",
"title": "Holding Out For A Hero",
"duration": 2620,
"artist": "Ella Mae Bowen",
"genre": "Country and Western",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/jlv9eb.mp3",
"title": "Jiko Bunseki",
"duration": 1420,
"artist": "Yuki Hayashi",
"genre": "Anime",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/vzbcsc.mp3",
"title": "Let It End",
"duration": 2220,
"artist": "Karliene",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/nsfwxe.mp3",
"title": "Proof Of A Hero (16 bit)",
"duration": 1410,
"artist": "Bulby",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ywoaqa.mp3",
"title": "Proof Of A Hero",
"duration": 1340,
"artist": "Kouda Masato",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/xlrbbe.mp3",
"title": "Pure Imagination",
"duration": 2060,
"artist": "Fiona Apple",
"genre": "Electronic",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/q3f6sq.mp3",
"title": "Rhapsody In Blue",
"duration": 9870,
"artist": "Kamil Hala, Slovak Philharmonic Orchestra, Libor Pešek",
"genre": "Classical and Orchestral",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/vzsm5k.mp3",
"title": "Surface Of SR388",
"duration": 1710,
"artist": "BG Ollie",
"genre": "Video Game",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/ngtv3e.mp3",
"title": "Where My Heart Will Take Me",
"duration": 0,
"artist": "Russell Watson",
"genre": "Country and Western",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/cfq7bo.mp3",
"title": "Kiss From A Rose",
"duration": 2860,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/4mypzc.mp3",
"title": "Black Hole Sun",
"duration": 3210,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/qpkv1q.mp3",
"title": "I Still Haven't Found What I'm Looking For",
"duration": 2870,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/g8vawq.mp3",
"title": "Nights In White Satin",
"duration": 2710,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/01ljjx.mp3",
"title": "Land Of Confusion",
"duration": 2850,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/2iugx4.mp3",
"title": "Aspirations",
"duration": 3010,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/m3cwu1.mp3",
"title": "Head Over Heels",
"duration": 2420,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/xtizlg.mp3",
"title": "Get Lucky",
"duration": 2490,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/dym0sp.mp3",
"title": "God Only Knows",
"duration": 1810,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/i8gml0.mp3",
"title": "Scarborough Fair",
"duration": 2020,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/chc70l.mp3",
"title": "The Sphere A Kind Of Dream",
"duration": 620,
"artist": "Dan Avidan & Super Guitar Bros",
"genre": "Acoustic",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/w48oqv.mp3",
"title": "Pushin' The Speed of Light",
"duration": 2130,
"artist": "Julia Ecklar & Anne Prather",
"genre": "Folk and Indie",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/zacsky.mp3",
"title": "S.T.L.",
"duration": 1190,
"artist": "Free Fall & Other Delights",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/9a3ow3.mp3",
"title": "Phantom Lover of the Star Drive",
"duration": 1930,
"artist": "Free Fall & Other Delights",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/eo59pv.mp3",
"title": "Molecular Clouds",
"duration": 1560,
"artist": "Free Fall & Other Delights",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/227jw9.mp3",
"title": "A Reconsideration (Zero-G Sex)",
"duration": 2530,
"artist": "Free Fall & Other Delights",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/yvn8bu.mp3",
"title": "Stuck Here",
"duration": 1360,
"artist": "Free Fall & Other Delights",
"genre": "Folk and Indie",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/nsnf73.mp3",
"title": "The Ballad of Transport 18",
"duration": 2660,
"artist": "Leslie Fish",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/hwsbsi.mp3",
"title": "Don't Push That Button",
"duration": 2450,
"artist": "Duane Elms",
"genre": "Folk and Indie",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/iizfw9.mp3",
"title": "Late Night at the Draco Tavern",
"duration": 2600,
"artist": "Duane Elms",
"genre": "Folk and Indie",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/4zaljk.mp3",
"title": "Startide Rising",
"duration": 1050,
"artist": "Duane Elms",
"genre": "Folk and Indie",
"secret": false,
"lobby": true,
"jukebox": true
},
{
"url": "https://files.catbox.moe/9y01ry.mp3",
"title": "F.A.P. Feline American Princess",
"duration": 2640,
"artist": "Leslie Fish",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
},
{
"url": "https://files.catbox.moe/s7u3vi.mp3",
"title": "Hymn to Breaking Strain",
"duration": 2710,
"artist": "Julia Ecklar & Leslie Fish",
"genre": "Folk and Indie",
"secret": false,
"lobby": false,
"jukebox": true
}
]

20
modular_chomp/code/datums/autolathe/engineering_ch.dm Normal file
View File

@@ -0,0 +1,20 @@
// reverse 'escape plans' the autolathe here, 2017 grudge code be like
/datum/category_item/autolathe/engineering/capacitor
name = "capacitor"
path =/obj/item/weapon/stock_parts/capacitor
/datum/category_item/autolathe/engineering/scanning_module
name = "scanning module"
path =/obj/item/weapon/stock_parts/scanning_module
/datum/category_item/autolathe/engineering/manipulator
name = "micro-manipulator"
path =/obj/item/weapon/stock_parts/manipulator
/datum/category_item/autolathe/engineering/micro_laser
name = "micro laser"
path =/obj/item/weapon/stock_parts/micro_laser
/datum/category_item/autolathe/engineering/matter_bin
name = "matter bin"
path =/obj/item/weapon/stock_parts/matter_bin

7
modular_chomp/code/modules/emotes/definitions/audiable.dm
View File

@@ -1,3 +1,10 @@
/decl/emote/audible/wheeze
emote_sound = 'modular_chomp/sound/voice/wheeze.ogg'
/decl/emote/audible/prbt2
key = "prbt2"
emote_message_1p = "You prbt."
emote_message_3p = "prbts."
emote_message_1p_target = "You prbt at TARGET."
emote_message_3p_target = "prbts at TARGET."
emote_sound = 'sound/voice/prbt2.ogg'

BIN
sound/voice/prbt2.ogg Normal file
View File

Binary file not shown.

2
tgui/packages/tgui-polyfill/package.json
View File

@@ -11,6 +11,6 @@
"unfetch": "^4.2.0"
},
"devDependencies": {
"terser": "^5.13.1"
"terser": "^5.14.2"
}
}

18
tgui/yarn.lock
View File

@@ -8882,7 +8882,21 @@ __metadata:
languageName: node
linkType: hard
"terser@npm:^5.13.1, terser@npm:^5.7.2":
"terser@npm:^5.14.2":
version: 5.14.2
resolution: "terser@npm:5.14.2"
dependencies:
"@jridgewell/source-map": ^0.3.2
acorn: ^8.5.0
commander: ^2.20.0
source-map-support: ~0.5.20
bin:
terser: bin/terser
checksum: cabb50a640d6c2cfb351e4f43dc7bf7436f649755bb83eb78b2cacda426d5e0979bd44e6f92d713f3ca0f0866e322739b9ced888ebbce6508ad872d08de74fcc
languageName: node
linkType: hard
"terser@npm:^5.7.2":
version: 5.14.1
resolution: "terser@npm:5.14.1"
dependencies:
@@ -8955,7 +8969,7 @@ __metadata:
dependencies:
core-js: ^3.22.5
regenerator-runtime: ^0.13.9
terser: ^5.13.1
terser: ^5.14.2
unfetch: ^4.2.0
languageName: unknown
linkType: soft

1
vorestation.dme
View File

@@ -4484,6 +4484,7 @@
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
#include "maps\~map_system\maps.dm"
#include "modular_chomp\code\datums\autolathe\arms.dm"
#include "modular_chomp\code\datums\autolathe\engineering_ch.dm"
#include "modular_chomp\code\datums\autolathe\general_ch.dm"
#include "modular_chomp\code\game\machinery\airconditioner_ch.dm"
#include "modular_chomp\code\modules\admin\functions\modify_traits.dm"