cadyn
fe84e96797
Revert "Delete defib timer"
2021-01-24 22:48:39 -08:00
cadyn
2fe77a59ac
Revert "fixing defib timer and adding surgery for that shit"
2021-01-24 22:46:10 -08:00
Cadyn
4156dd8085
fixing defib timer and adding surgery for that shit
2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5
Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended."
2021-01-24 18:53:16 -08:00
cadyn
c5ae5ec866
Merge pull request #1134 from CHOMPStation2/cadyn-patch-5
...
Delete defib timer
2021-01-24 06:52:37 -08:00
Novacat
57e1be6caa
Merge pull request #9598 from Heroman3003/defibfix
...
Fixes defib timers being 10 times as long compared to intended.
2021-01-24 06:34:15 +00:00
cadyn
fdbe1750cf
Update organ.dm
2021-01-19 20:13:09 -08:00
cadyn
0837218461
another thingy
2021-01-16 23:08:11 -08:00
cadyn
76c3f49a0f
Other thing that needed to be removed
2021-01-16 22:49:15 -08:00
Chompstation Bot
da85f80845
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-24 00:54:34 +00:00
Novacat
c73420518a
Merge pull request #9323 from VOREStation/upstream-merge-7759
...
[MIRROR] Fix Simplemob+ Organs
2020-11-18 22:14:58 +00:00
cadyn
8c59263e72
Update robolimbs_vr.dm
2020-11-15 16:26:22 -08:00
cadyn
9234b847af
Make it more clear.
2020-11-15 16:24:55 -08:00
cadyn
a67c751841
Merge branch 'master' into upstream-merge-9307
2020-11-15 00:48:22 -08:00
Chompstation Bot
f932e65178
Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
2020-11-15 08:44:14 +00:00
Chompstation Bot
018d176c51
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
Nadyr
30717d0f05
Merge pull request #749 from cadyn/linguist
...
Cadyn's traits changes part 1
2020-10-26 00:01:38 -04:00
r4d6
47b68cbe86
Make Tesh Limbs printable again.
2020-10-25 22:48:33 -04:00
r4d6
0979453dab
Make the more fancy limbs unable to be printed right away.
2020-10-24 09:06:39 -04:00
Cadyn
bd2e76e4e8
Cadyn's traits changes part 1
2020-10-22 20:02:21 -07:00
r4d6
b53e6b8a18
This one was an accident and not intended.
2020-10-22 13:05:28 -04:00
r4d6
4413a6e444
Allow more types of Prosthetic to be made and torsos are no longer black.
2020-10-22 12:56:31 -04:00
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
