cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-28 18:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,210 Commits 8 Branches 0 Tags
fbf6c88f42ec43932c4e36f8a5ffe6ccc8362cce
Commit Graph

6520 Commits

Author SHA1 Message Date
Sharkmare
56b320d093 comment 2023-03-19 20:56:49 +01:00
Sharkmare
41e8e1fa4b Brings Communicators further in line with DPAs 
Allows mounting Comm watches to the belt and ID slot just like the regular communicator (just like the wrist mounted PDA)
 2023-03-19 20:45:59 +01:00
Sharkmare
c42510c309 Adding an ID slot to the Communicator 
Allows you to slot your scanned ID into your communicator
 2023-03-17 23:15:56 +01:00
Nadyr
c74dd3431a Merge pull request #5958 from Sharkmare/patch-19 
Jar + Small people
 2023-03-17 04:02:25 -04:00
Nadyr
0fc70ed7d1 Merge pull request #5928 from CHOMPStation2/upstream-merge-14684 
[MIRROR] [MIRROR] Fixes a raunchy typo
 2023-03-17 03:25:05 -04:00
Nadyr
d26d90028d Merge pull request #5934 from CHOMPStation2/upstream-merge-14662 
[MIRROR] Weapon Info on Examine
 2023-03-17 03:19:20 -04:00
Nadyr
7a0786754b Merge branch 'master' into upstream-merge-14684 2023-03-17 03:10:41 -04:00
Nadyr
506661f8f4 Merge pull request #5919 from CHOMPStation2/upstream-merge-14551 
[MIRROR] [MIRROR] /tg/ era language pass
 2023-03-17 02:40:16 -04:00
Sharkmare
3231d8c9fc fixed? 2023-03-16 14:03:17 +01:00
Sharkmare
eaca1b5455 Jar + Small people 
Do i need to explain further?
 2023-03-16 13:55:12 +01:00
Heroman3003
5922267371 Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-14 18:44:19 +00:00
Heroman3003
23df1fdc43 [MIRROR] Fixes a raunchy typo 2023-03-14 08:09:21 +00:00
Heroman3003
025fac4bf9 [MIRROR] /tg/ era language pass 2023-03-13 05:23:57 +00:00
Novacat
230498d990 Merge pull request #14659 from Heroman3003/mre-and-int 
Two fix
 2023-03-12 04:33:32 +00:00
Nadyr
8e87297f90 Merge pull request #5883 from CHOMPStation2/upstream-merge-14583 
[MIRROR] more fixed admin hrefs
 2023-03-09 21:23:50 -05:00
Nadyr
7baa5027ef Merge pull request #5857 from RinPin/master 
Adds green fox plushie!
 2023-03-09 20:37:03 -05:00
Heroman3003
4fff3b4226 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 05:08:26 +00:00
Heroman3003
62d770eafe Character Setup Lore Option Tweaks 2023-03-06 13:29:45 -05:00
Heroman3003
ce5ef389b3 Custom Species name in Records 2023-03-06 12:59:00 -05:00
RinPin
edaad07ea8 Adds green fox plushie! 
Adds a green fox plushie to the game and loadout. to go with the other colored fox plushies.
 2023-03-05 20:29:54 -03:00
Rykka Stormheart
640a73cb06 Adds Deafened Feedback, enhances looping sounds further 
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.

Example of deafened feedback [here](https://streamable.com/8s8vlu). 

Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing. 

It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
 2023-03-03 04:08:08 -08:00
Razgriz
ada3e13709 Make ticket printer smaller 
Because something so small, trivial, and used for silly RP should not be practically gigantic.
 2023-02-27 16:54:21 -07:00
Heroman3003
d13fc550dc adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 09:46:20 +00:00
Razgriz
3b0f59cea1 Merge pull request #5794 from CHOMPStation2/upstream-merge-14533 
[MIRROR] [MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 01:02:56 -07:00
Razgriz
89440c6d2e Merge pull request #5779 from CHOMPStation2/upstream-merge-14534 
[MIRROR] Adjusts artistic crate orders
 2023-02-26 00:56:08 -07:00
Heroman3003
558d6e2431 Merge pull request #14533 from VOREStation/upstream-merge-8965 
[MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 00:58:49 +00:00
Heroman3003
993acbf556 Merge pull request #14534 from Heroman3003/art-paint-stuff 
Adjusts artistic crate orders
 2023-02-25 03:01:42 +00:00
Heroman3003
b34a6da9bd Merge pull request #14497 from Seris02/capcrystalunleashfix 
cap crystal ooc escape fix
 2023-02-22 08:50:32 +00:00
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Razgriz
574e463b5d comments that make you say yes 2023-02-13 22:04:59 -07:00
Sharkmare
77a073ac71 Fxiing taperecorder voices 
Carbon/Human has a voice variable for voicechangers and to not go unknown when face is covered without ID, taperecorder now respects that
 2023-02-14 02:13:27 +01:00
Nadyr
40322e3b47 Merge pull request #5651 from CHOMPStation2/upstream-merge-14423 
[MIRROR] Add required components to circuit board examine text
 2023-02-07 13:27:16 -05:00
Heroman3003
a5c34244ed Merge pull request #14447 from VOREStation/upstream-merge-8929 
[MIRROR] Fixes powersink having no sprite
 2023-02-06 06:57:26 +00:00
Heroman3003
450842aaec Merge pull request #14428 from VOREStation/upstream-merge-8915 
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
 2023-02-04 20:58:26 +00:00
Heroman3003
7801d8845f Merge pull request #14423 from TheGreatKitsune/circuit_board_examine 
Add required components to circuit board examine text
 2023-02-04 20:36:40 +00:00
Heroman3003
cbda0ff446 Merge pull request #14414 from Runa-Dacino/NIFrepairtoolfix 
Fixes NIF repair tool using up nanopaste when full
 2023-02-03 18:38:35 +00:00
Nadyr
0093bbac01 Merge pull request #5555 from lbnesquik/kot-muffle-item 
Add a mode to muffle items.
 2023-02-02 20:35:44 -05:00
Nadyr
57ae8c01ee Merge pull request #5564 from CHOMPStation2/upstream-merge-14336 
[MIRROR] [MIRROR] Repairing light robotic damage messaging fix
 2023-01-27 10:11:46 -05:00
Nadyr
55034ed973 Merge pull request #5588 from CHOMPStation2/upstream-merge-14353 
[MIRROR] Tilted Duffles
 2023-01-27 10:11:16 -05:00
Nadyr
7d25e70249 Merge branch 'master' into upstream-merge-14336 2023-01-27 09:43:44 -05:00
Nadyr
05407f585a Merge pull request #5551 from CHOMPStation2/upstream-merge-14330 
[MIRROR] Uplink and Pouch Tweaks
 2023-01-27 09:27:06 -05:00
Nadyr
f08f632ed4 Merge pull request #5539 from CHOMPStation2/upstream-merge-14327 
[MIRROR] Makes all carpet types orderable and gives them tile icons
 2023-01-27 09:16:47 -05:00
Nadyr
c7e4426a88 powder that makes you say yes 2023-01-27 08:59:21 -05:00
Nadyr
ce193717de powder that makes you say yes 2023-01-27 08:44:50 -05:00
Razgriz
33f82fd5ac Update radio.dm 2023-01-21 22:28:49 -07:00
Razgriz
9197e1b95d Merge branch 'master' into upstream-merge-14220 2023-01-21 22:24:10 -07:00
Razgriz
418643dce3 unfucc exploration 
please do not the department
 2023-01-21 22:21:39 -07:00
Heroman3003
ddd078fdca Merge pull request #14353 from KillianKirilenko/kk-duffs 
Tilted Duffles
 2023-01-22 01:34:01 +00:00
Heroman3003
092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +00:00
lbnesquik
ff68eaaffd Fix it in a bad way. 2023-01-18 03:52:33 +01:00