cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-19 05:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,223 Commits 9 Branches 0 Tags
aaa61d637790781bd6b24ba6f792e365f53ee252
Commit Graph

1082 Commits

Author SHA1 Message Date
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
fd563559ad Merge pull request #9077 from VOREStation/upstream-merge-7668 
[MIRROR] Actually commit the reagent cycler's entire gimmick.
 2020-09-21 14:06:14 -04:00
Novacat
6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651 
[MIRROR] Tweaks to pickup/equip sounds.
 2020-09-21 13:51:44 -04:00
Atermonera
d0fd1df327 Merge pull request #7668 from Mechoid/ReagentCyclingCycler 
Actually commit the reagent cycler's entire gimmick.
 2020-09-21 12:48:24 -04:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Matica
c04771f0fe Dogborg Uprising 
Brings in dogborg markings for character creation! Made by skits.
 2020-09-07 17:00:38 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
ab88747252 Merge pull request #8755 from VOREStation/upstream-merge-7452 
[MIRROR] Gives FBP's a proc to change their monitor display without using a mask item.
 2020-08-21 13:32:51 -04:00
Rykka
16da38037d Fix incoming merge conflicts with PR #8757 
NIF Heatsinks will preserve their behavior of preventing BASE heat increases, but will not be able to compensate for if your NEW heatsink component is damaged or disabled.

Robolimb damage remains scalable as the conflict was simply taht the check was indented/nested underneath another.
 2020-08-21 05:26:49 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
SplinterGP
cf491a56b7 Gives FBP's a proc to change their monitor display without using a mask item. 2020-08-20 21:25:20 -04:00
SplinterGP
409bd14a6f adds more jeanne displays 2020-08-20 21:17:54 -03:00
SubberTheFabulous
eb48eef20e Adds New Prosthetics Set (#7467) 
* Adds a new FBP CS set, removes old alt2

* Adds a new FBP CS set, removes old alt2

* Readds Cyber Solutions - Array

* Readds Cyber Solutions - Array

* Adds a new FBP CS set

Changelog
 2020-08-17 18:04:54 -04:00
Repede
6b538466bd Merge branch 'master' into Mapping 2020-08-13 19:35:13 -04:00
SplinterGP
01c798bd3f removes my ckey from the allowed list, used on test 2020-08-13 19:16:01 -03:00
SplinterGP
251d2fd8dd Jeanne nanovulp fluff robolimbs 2020-08-13 19:05:23 -03:00
SplinterGP
41b4c7f604 Early ports FBP monitor display replacement 2020-08-13 18:43:32 -03:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Repede
74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
Novacat
6866cf2cbf Merge pull request #8601 from Rykka-Stormheart/shep-dev-mulebot-steppies-fix 
Fix Mulebot Crossed() Code, allows simplemobs to be crushed if laying
 2020-08-07 00:29:58 -04:00
Rykka
86bf733872 Fix Mulebots running over themselves, fix runtime with blood.dm 2020-08-05 22:18:13 -04:00
Cyantime
78ec7a7733 Fix promethean revival flavor text and OOC notes 2020-08-05 05:26:03 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Atermonera
65cfe5f6e3 Implements Status Indicators 2020-07-30 15:30:44 -04:00
izac112
1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Repede
baaf131730 Alt pattern for the xion outfit: named xion (yw alt) - Spritefix by whiteout 2020-07-06 19:22:22 -04:00
Novacat
9fee4f4c7b Merge pull request #8367 from KillianKirilenko/kk-fixes 
Update robolimbs_vr.dm
 2020-07-06 07:31:53 -04:00
Killian
89b1cc659f Update robolimbs_vr.dm 2020-07-06 08:47:42 +01:00
Novacat
33e07ac92d Merge pull request #8091 from Cameron653/transparency_v2 
Adds the ability for prometheans to toggle transparency.
 2020-07-03 17:49:45 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Aronai Sieyes
6fbbe840fe Fix defib timer on MMIs 2020-06-05 15:55:08 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
izac112
e45ac4c224 one more fix 2020-05-27 22:44:09 +02:00
izac112
be538243c1 various fixes 2020-05-27 22:43:33 +02:00
Cameron653
846c8b7b16 This should all work, but I'm getting unrelated compile errors. 2020-05-27 14:19:30 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
3237ae96d7 Merge pull request #7987 from VOREStation/Arokha/talks 
Talking changes
 2020-05-20 16:09:40 -04:00
Aronai Sieyes
50e09c0ee7 Fix a few talking issues 
Posibrain talking without a language, give speech bubbles to things inside things, especially posibrains, give gibberish a chance instead of using null languages
 2020-05-20 13:52:08 -04:00
Atermonera
c3e5e6c1f1 Edit Appearance and Change Appearance update icon sex 2020-05-19 21:54:38 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00