Commit Graph

1259 Commits

Author SHA1 Message Date
Heroman 3407d0baa5 FIXES EYES 2021-03-12 16:20:10 +10:00
Novacat 22ca887048 Merge pull request #9786 from VOREStation/upstream-merge-7907
[MIRROR] Fixes some fluff weirdness with Virgo-ported prosthetics
2021-03-11 15:59:36 -05:00
Unknown 0183d7b55b Resets robolimbs_vr to Virgo 2021-03-11 15:41:44 -05:00
Unknown efe06bf946 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7907 2021-03-11 15:39:06 -05:00
Novacat 11a752a2ef Merge branch 'master' into upstream-merge-7788 2021-03-11 15:36:28 -05:00
Novacat b865bf8f12 Update organ_icon.dm 2021-03-11 15:25:27 -05:00
Unknown 213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Novacat 16e4f1ba4d Merge pull request #9828 from Heroman3003/maximum-detachability
Makes all synthetic limbs freely attachable/detachable.
2021-03-04 01:17:58 -05:00
Unknown 41f4948621 Earlyports Stair fix from Polaris
https://github.com/PolarisSS13/Polaris/pull/7943
2021-03-02 17:13:14 -05:00
Heroman3003 c299798915 Merge branch 'master' into maximum-detachability 2021-03-03 04:47:38 +10:00
Heroman ebced2f5e0 un-nerfs Skrell veymed limbs 2021-03-02 05:57:04 +10:00
Heroman ef428cf0a0 Makes all synthetic limbs freely attachable/detachable. 2021-03-02 05:48:34 +10:00
Novacat 538c805601 Merge pull request #9814 from VOREStation/upstream-merge-7820
[MIRROR] Adds the Restraining Bolt.
2021-02-28 18:16:22 -05:00
Novacat 827b30c844 Merge pull request #9787 from VOREStation/upstream-merge-7905
[MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
2021-02-28 18:07:37 -05:00
Mechoid f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
Novacat d7c949c010 Update robolimbs.dm 2021-02-28 17:55:45 -05:00
Unknown 973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown e6db218e71 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-02-28 14:29:46 -05:00
MistakeNot4892 3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Atermonera c00ed7e3b1 Added verbs/handling for removing and attaching your own robotic bodyparts. 2021-02-23 17:19:28 -05:00
Atermonera e0a61cc1d6 Fixes some fluff weirdness with Virgo-ported prosthetics 2021-02-23 17:19:14 -05:00
Novacat bcaf7dcdff Merge pull request #9445 from VOREStation/upstream-merge-7369
[MIRROR] Department and Round Goals
2021-02-21 17:14:47 -05:00
Unknown bc6929535a Earlyports Polaris Fixes 2021-02-15 17:36:05 -05:00
Heroman f03fc5f240 Fixes defib timers being 10 times as long compared to intended 2021-01-24 09:58:45 +10:00
Atermonera bee9156f01 Fires nanites responsible for incorrect facial hair coloring. Hires human barber from the Bowl to dye everyone's beards 2020-12-17 17:22:52 -05:00
Mechoid 40d65d962f Department and Round Goals 2020-12-11 19:19:15 -05:00
KasparoVy ae8970ab2f Eyes Synth Monitor, Switching Eye Layer Verb
Everything works, trust me.
2020-11-21 18:18:23 -05:00
Novacat 70640ca8ac Update organ_external.dm 2020-11-19 19:50:33 -05:00
Mechoid a62f766bb5 Kaleidoscope 2: The Retabbening 2020-11-19 13:06:10 -05:00
Atermonera 02e7326aa0 Merge pull request #7759 from Mechoid/FixOrgansSimplemob
Fix Simplemob+ Organs
2020-11-18 16:58:47 -05:00
KasparoVy 61f6aa3a12 Woops, This was Missing 2020-11-14 21:04:16 -05:00
KasparoVy 17d7a13bda Ports CitRP Protogen Markings/Robopart, Some Vox Markings, Teshari Markings Ears + Tails
CitRP PR 2390 & 2168

Adds Protogen robohead (based on Ward-Takahashi Spirit) + Monitor states
Adds Protogen markings
Adds Teshari markings
Adds 2 Teshari Ears
Adds 4 Teshari Tails
Renames Basic Teshari Tail
2020-11-14 20:51:01 -05:00
Verkister 5eeb73814d Update organ.dm 2020-11-08 13:41:31 +02:00
Verkister 0fbd3b4bcb Update organ_icon.dm 2020-11-08 13:12:23 +02:00
Verkister 8d5c109be7 Update organ.dm 2020-11-08 13:10:06 +02:00
Verkister 5018df615e Update brain.dm 2020-11-08 13:08:35 +02:00
Mechoid 019926cbc7 Fresh Meat, Leatherworking 2020-11-07 15:08:04 -05: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
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
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
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
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