cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,075 Commits 8 Branches 0 Tags
6c05f5da45d3db36f8980e35e1a758134ab1bd6d
Commit Graph

2814 Commits

Author SHA1 Message Date
Heroman3003
ee8c705e3a Merge pull request #15156 from Heroman3003/fluffstuff 
Fluff updates
 2023-07-18 05:21:35 +00:00
Novacat
e33a9c75a6 Giant Bow (Also fluff item for verysoft) 2023-07-15 19:02:31 +00:00
Heroman3003
09d54d955e Merge pull request #15126 from Heroman3003/tgui-bday-fix 
Fixes tgui input breaking Birthday inputs
 2023-07-08 19:36:34 +00:00
Raeschen
b3d1bf3be4 Update 01_basic.dm 2023-07-08 00:01:17 +02:00
Raeschen
1afe3df5f0 Update 01_basic.dm 2023-07-07 23:58:27 +02:00
Heroman3003
01869185b3 Merge pull request #15118 from Very-Soft/burf 
BIRTH
 2023-07-07 20:50:07 +00:00
Digi Purpur
33394d6d07 Supermatter Lighters balanced, and added fully. <3 
ALL experimental features for /selfattack added. (Procs on opening the lighter).
It'll be turned into a WMD eventually <3
 2023-07-03 07:32:01 -07:00
Raeschen
6ec26808d5 Merge pull request #6485 from CHOMPStation2/upstream-merge-15099 
[MIRROR] A variety of miscellaneous bugfixes
 2023-07-02 15:45:15 +02:00
Heroman3003
9926ef6647 Merge pull request #15099 from Heroman3003/misc-fixes 
A variety of miscellaneous bugfixes
 2023-07-01 23:33:38 +00:00
Heroman3003
f4ec2e5922 ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat 2023-07-01 20:25:47 +00:00
Heroman3003
48926a6afb Merge pull request #15091 from Runa-Dacino/ghostpodstuff 
Fixes and tweaks "Survivor Pods"
 2023-06-28 21:34:39 +00:00
Raeschen
5e8b9b744e no armor in loadout 2023-06-28 13:36:51 +02:00
Raeschen
d66c728f05 add tacticool turt to loadout, give sensors 2023-06-28 13:22:45 +02:00
Heroman3003
5e67353570 Merge pull request #15066 from Heroman3003/loadoutfix 
Fixes missing fur coat in loadout
 2023-06-23 18:44:46 +00:00
Raeschen
c85a5a2326 Merge pull request #6425 from Sharkmare/patch-37 
Lower cost of TTS in Loadout
 2023-06-21 17:12:19 +02:00
Selis
67ba4a2de5 Tickets System 2023-06-21 13:51:32 +02:00
Sharkmare
706fe49eb2 Lower cost of TTS in Loadout 
TTS is pure flavor since we all speak common, theres no reason for it to be more expensive
 2023-06-21 12:19:09 +02:00
Raeschen
2dfa96125a Remove KHI 2023-06-19 15:17:12 +02:00
Raeschen
9ae31e501e Merge pull request #6411 from CHOMPStation2/upstream-merge-15043 
[MIRROR] Spell Fixes
 2023-06-19 12:42:37 +02:00
Raeschen
de6a048679 fix merge conflicts 2023-06-19 11:48:24 +02:00
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
617e2e55b9 Loadout Overhaul 2023-06-18 18:47:29 +00:00
Raeschen
1cffb3f0e7 Merge pull request #6368 from Rykka-Stormheart/shep-dev-more-sounds 
Sound Additions + Tweaks
 2023-06-18 16:27:37 +02:00
Raeschen
1f99e6ce53 Merge pull request #6329 from CHOMPStation2/upstream-merge-14976 
[MIRROR] More 515 Compatibility
 2023-06-18 14:59:19 +02:00
Raeschen
fd87fd5da1 Merge pull request #6367 from Sharkmare/patch-36 
Change "Admin Login:"
 2023-06-17 23:46:46 +02:00
Raeschen
2c3eefe326 Merge branch 'master' into upstream-merge-14976 2023-06-17 14:47:37 +02:00
Raeschen
1c8cb00b7f Merge pull request #6088 from CHOMPStation2/upstream-merge-14756 
[MIRROR] Preferred Language + Autohiss Default Options
 2023-06-17 13:25:34 +02:00
Raeschen
d4992917ce Fix merge conflicts 2023-06-17 13:07:51 +02:00
Rykka Stormheart
1de51fb4b8 Sound Additions + Tweaks 
Changes listed below:
* Makes Death Sounds mutable on their own audio channel.
* Makes Ear Ringing use the HUD Channel for sounds

Additions:
* [Adds On Fire effect](https://streamable.com/c1fxeo)
* Adds Stunned effect(https://streamable.com/v2if0s)
* [Adds SMES humming based on power usage in/out. Affected by walls, will only play if in LOS and visible.](https://streamable.com/z41x90)
* [Adds Atmos Alerts making a noise on the monitor](https://streamable.com/uhegq6)
* [Tcomms + PDA servers hum when powered and active, also respects walls/LOS](https://streamable.com/vb08x1)
* [Fridges hum quietly while powered](https://streamable.com/c3zsz7)
* [Point Defense turrets now make a sound audible from inside the station when firing, to add more spice to meteor waves.](https://streamable.com/bf8mwl)
* Shield Generators now hum when active.
 2023-06-15 12:27:23 -07:00
Sharkmare
8bfd87068f Change "Admin Login:" 
Change "Admin Login:" to "Staff Login:"
This is because realistically its logging more than JUST admins so the name annoys me personally, feel free to not merge lmao
 2023-06-15 13:05:36 +02:00
Nadyr
ea3c4ec289 Merge pull request #6299 from CHOMPStation2/upstream-merge-14942 
[MIRROR] Zera's Purple Cloak
 2023-06-09 21:58:40 -04:00
Nadyr
234de98640 powder that makes you say yes 2023-06-09 21:41:10 -04:00
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
a053cba8e8 Merge pull request #14935 from Runa-Dacino/ventroliquism 
Adds a set of admin verbs for speaking/emoting as objs/mobs/turf without possessing them
 2023-06-03 09:22:13 +00:00
Heroman3003
bf4c7eeffe Zera's Purple Cloak 2023-06-03 09:20:53 +00:00
Nadyr
67208f1769 powder that makes you say yes 2023-05-31 18:35:21 -04:00
Heroman3003
8d4fe86bdf Adds new shoe: "Elegant Sandals". Adds it to loadout 2023-05-30 20:23:12 +00:00
Nadyr
883f2430ce Merge branch 'master' into upstream-merge-14893 2023-05-29 19:09:57 -04:00
Nadyr
2ba64a5b79 Merge pull request #6243 from CHOMPStation2/upstream-merge-14872 
[MIRROR] Uniform Selectors
 2023-05-29 19:06:25 -04:00
Nadyr
a828d32b39 powder that makes you say yes 2023-05-29 18:50:08 -04:00
Nadyr
b30356ebd4 Merge pull request #6245 from CHOMPStation2/upstream-merge-14894 
[MIRROR] Adds Aria's medal
 2023-05-29 18:41:55 -04:00
Nadyr
182873418f Merge branch 'master' into upstream-merge-14893 2023-05-29 18:41:05 -04:00
Heroman3003
c83f29cf13 Merge pull request #14894 from Heroman3003/aria-medal 
Adds Aria's medal
 2023-05-25 02:51:12 +00:00
Heroman3003
338d5f605b TG Clothing Pack Polish 2023-05-25 02:27:29 +00:00
Heroman3003
deae0d7291 Uniform Selectors 2023-05-25 02:14:01 +00:00
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion 
New Poncho Style
 2023-05-25 02:11:24 +00:00
Casey
c0093930a5 Merge pull request #14857 from BonniePandora/CustomItem-NameChange 
Small custom-item changes
 2023-05-15 00:18:21 +00:00
Verkister
1bebca2c03 Fixes char setup tail layering. 
Guess we aint goin a bit elephant style for much longer.
 2023-05-02 16:53:01 +03:00
Nadyr
7200a5e85a Merge pull request #6164 from CHOMPStation2/upstream-merge-14823 
[MIRROR] Added striped dungarees and tiny tophat
 2023-04-30 22:49:59 -04:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00