cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 06:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,587 Commits 8 Branches 26 Tags
0101cd85ca8606dfa24ce1344f9d4eccb07da71f
Commit Graph

943 Commits

Author SHA1 Message Date
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them 
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
 2020-05-13 19:36:01 -07:00
Aronai Sieyes
b3c1cfd29d Merge pull request #7516 from VOREStation/upstream-merge-7045 
[MIRROR] Removes limits on eating, centralizes nutrition changing.
 2020-04-29 19:23:55 -04:00
Aronai Sieyes
893130bdff Merge nutrition refactor for vorestation 2020-04-29 18:34:22 -04:00
Atermonera
f1cabd6742 Removes limits on eating, centralizes nutrition changing. 2020-04-29 17:15:15 -04:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Novacat
2ffcf2c685 Merge pull request #6960 from Holdelta/VS-Custom-DSITeshari 
Allowing Custom Species access to DSI - Teshari prosthetic limbs.
 2020-04-19 23:03:25 -04:00
Neerti
e89fef965e QoL: Stasis and Defibs 2020-04-07 00:39:35 -04:00
Novacat
702ccbee5c Update lungs.dm 2020-03-27 08:39:57 -04:00
Atermonera
c49c1e40f3 Fix runtimes in lungs.dm 2020-03-27 03:18:28 -04:00
Arokha Sieyes
34a9cd4561 Fix stupid lung runtime 2020-03-27 00:41:36 -04:00
Novacat
94f5eda84c Merge pull request #6967 from VOREStation/upstream-merge-6881 
[MIRROR] Add mob/living stat setter and observer
 2020-03-23 23:25:02 -04:00
Atermonera
87333d9c25 Add mob/living stat setter and observer 2020-03-23 22:47:44 -04:00
Atermonera
1873a3a870 Merge pull request #6880 from Greenjoe12345/teshariprosthetics 
Teshari prosthetics
 2020-03-23 22:38:13 -04:00
Holdelta
9cc3d90ded Allowing Custom Species access to DSI - Teshari prosthetic limbs. 
Since Teshari are allowed to be created as a custom race to begin with, I'm not seeing too many issues with this change.

Tested on local and the main thing to note is that the user has to choose Icon Base as Teshari to avoid any weirdness with gear, otherwise works as expected.
 2020-03-22 14:07:37 -07:00
Mechoid
487c39eab8 Antag Uplink Expansion 2020-03-17 00:23:20 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Aronai Sieyes
91d4e6897a Prosthetic Expansion: Advent of Species 
Update robolimbs.dm
Update vorestation.dme
Update prosfab_designs.dm
Fix prosfab_designs.dm
 2020-03-14 14:04:06 -04:00
Aronai Sieyes
967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05:00
Aronai Sieyes
b3b51a7c3a New sprites for discs with unique colors 
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
 2020-02-20 21:37:15 -05:00
Unknown
146d7ec7e1 Minor Protean Balans Tweaks 
- Boosts limb health to be roughly the same as Prometheans
- Gives slight brute resist
- Slightly reduces burn weakness
 2020-02-19 20:22:28 -05:00
Arokha Sieyes
74c6f7c1e7 Rename "Aronai Kadigan" -> "Aronai Sieyes" 2020-02-14 11:06:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Atermonera
560a24ee83 Merge pull request #6637 from Mechoid/AugmentsRespectBeds 
Augments Respect Beds, Robotic
 2020-01-25 22:14:02 -05:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Atermonera
ba8a46bb03 Merge pull request #6565 from Heroman3003/eyecolor-fix 
Fixes species without eyecolor being able to get one
 2019-12-15 14:49:27 -05:00
Heroman3003
402d0acebf Fixes vorestation species without eyecolor being able to have eyecolor 2019-12-14 09:51:20 +10:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Unknown
985d57f323 513 Compatability 2019-12-12 10:40:27 -05:00
Novacat
26b0f83192 Merge pull request #6241 from Heroman3003/black-eyed-fluffers 
New Species: Black-Eyed Shadekin
 2019-12-06 11:37:23 -05:00
Heroman3003
69ca6dc2f3 Gives crewkin less weakness to attacks, but weaker bones 2019-12-03 09:54:00 +10:00
Anewbe
a1e0aa8b90 Merge pull request #6539 from Mechoid/FixBioprinter 
Fix the bioprinter
 2019-11-29 19:51:23 -05:00
Heroman3003
4bef69e32a Adds black-eyed shadekin 2019-11-26 09:35:24 +10:00
Unknown
04ec5cf365 Fixes robolimb/ear path problems 2019-11-22 07:56:05 -05:00
Novacat
99301d33c0 Merge pull request #6216 from NoctuaAngelis/master 
Fix for tucker0666 fluff
 2019-11-22 07:22:05 -05:00
NoctuaAngelis
d6607f3c4d Add files via upload 2019-11-22 04:04:17 -06:00
NoctuaAngelis
481028c64e Add files via upload 2019-11-22 03:58:33 -06:00
Novacat
9ac320a347 Merge pull request #6194 from Heroman3003/shadekin-mini-fix 
Fixes minor issues with shadekin
 2019-11-21 21:43:44 -05:00
Sara Elizabeth
f3a2a1700a Merge remote-tracking branch 'VOREStation/master' 2019-11-17 11:20:39 -06:00
NoctuaAngelis
14cf784d3b Add files via upload 2019-11-16 17:11:54 -06:00
Heroman
eeb121a9b1 Fixes minor issues with shadekin 2019-11-16 13:04:01 +10:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman
991ab37daf Progress 2019-11-11 06:04:55 +10:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491) 
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
 2019-11-04 21:38:02 -05:00
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Novacat
5e7735a807 Update brain.dm 2019-10-22 21:14:26 -04:00
Unknown
6333e7ab72 Ports Polaris #6492 
Fixes a divide by zero issue with brain damage and pulse.
 2019-10-22 21:13:25 -04:00
Novacat
173fd85764 Merge pull request #6086 from Verkister/werespecies 
Adds werebeast event species
 2019-10-21 21:02:53 -04:00