1f8af98389
Plants and reagents
...
Fixed Pink peppers and milkmelon reagents, along with all special xenobotany plants from xenoarch.
2021-01-27 00:49:15 -08:00
0150066d67
Merge pull request #906 from ArchieBeepBoop/sleepers
...
Removes VR sleepers from pubby + disables crafting VR sleeper boards.
2021-01-19 23:40:26 +00:00
5c09c6df37
Merge pull request #903 from MalricB/punishesarchie
...
Entering upon horseback into the desert community known as "Agua Fria" located in the southwestern U.S. state known as New Mexico, a territory formerly under the jurisdiction of Spanish colonizers in 1598, was a man whose name, origin, motivations, and goals were unknown to every member of said desert community, on a particular day classified as "fine," indicating favorable weather conditions.
2021-01-19 23:39:54 +00:00
25a467633b
Removes VR sleepers from pubby + disables crafting VR sleeper boards.
2021-01-19 18:31:25 -03:00
ec3a68dc7a
Runtime man bad
2021-01-19 18:09:23 -03:00
9ba7d398f6
Revert "Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie""
...
This reverts commit 8cda8bbd16
2021-01-19 17:48:12 -03:00
17d7425417
MWS Microbatteries into techweb / sec techfab
2021-01-19 17:46:34 -03:00
8cda8bbd16
Revert "Merge branch 'punishesarchie' of https://github.com/MalricB/Hyper-Station-13 into punishesarchie"
...
This reverts commit 1945c166b4c8d20ea83c
2021-01-19 06:40:28 -03:00
41540397db
Fixes a bunch of fallout
2021-01-16 16:12:38 -03:00
9c1abdd9b4
Merge pull request #871 from Grant4455/master
...
Research fix for arcade machines and the Autoylathe
2021-01-15 20:36:18 +00:00
83567cf685
Ports techweb backend refactor & co.
...
from https://github.com/Citadel-Station-13/Citadel-Station-13/pull/9737
2021-01-15 18:28:36 +00:00
f8e852c6c9
Update all_nodes.dm
2021-01-13 20:28:18 -06:00
1a57be3bfd
Update all_nodes.dm
2021-01-13 07:35:24 -06:00
87ce4d858c
Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""
...
This reverts commit 08c8f744a9
2021-01-08 17:03:24 -03:00
08c8f744a9
Revert "Merge pull request #838 from ArchieBeepBoop/test1"
...
This reverts commit b0dbacee82813a2ea1c7
2021-01-08 19:28:18 +00:00
939d8258de
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
cd4fe44bbf
Merge pull request #789 from Tename/boggers
...
Borg equipment changes
2021-01-07 00:17:31 +00:00
4b8b03fea0
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2021-01-05 16:32:02 -03:00
10e74b643e
Fix scanners.dm conflict
2021-01-05 03:31:28 -03:00
b0779fe2d7
Merge pull request #9983 from Ghommie/Ghommie-cit408
...
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
7f2de64be7
RCD Update Sync
2021-01-04 18:13:02 -03:00
12c8ebea11
Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2021-01-03 05:21:47 -03:00
b21c65055a
Surgery fix package
2021-01-02 19:03:45 -03:00
c2a937bb73
Changing Nanotrasen to Kinaris where needed
2020-12-31 17:58:25 +00:00
1685663b80
Let IPCs and SynthLiz be injected by nanites
2020-12-31 16:46:14 +00:00
769721300f
boggers
2020-12-29 22:12:38 -08:00
10069637a5
Merge pull request #9441 from lolman360/whydowehave1000branches
...
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
c27dbcaf5f
Merge pull request #9522 from Linzolle/tend-wounds
...
Tend Wounds + Make Revival more accessible
2020-12-27 04:27:29 -03:00
5710e12cb5
Surgery ports 1
2020-12-27 04:25:28 -03:00
a7c539ac32
Ports reagents id removal and typepath usage.
2020-12-09 14:32:36 -03:00
ad8a067015
agonyyyy
2020-12-01 18:09:00 -03:00
6645e50dad
Merge pull request #694 from ArchieBeepBoop/improvements
...
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
7a8fcf77d4
ATMOS Firelocks and more
2020-11-19 11:04:04 -03:00
4bd370532d
Merge pull request #8401 from Ghommie/Ghommie-cit11
...
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
dbc0d7c1a0
Large beakers to department lathes, large hypovial research
2020-11-05 16:09:38 -03:00
2b45cd536d
adv hypo design
2020-11-03 04:37:45 -03:00
ca0939c2f8
fixes the two broken autobottler designs
2020-10-30 15:06:25 -03:00
9acf8ffd40
merge conflict drinks.dmi
2020-10-29 13:50:19 -03:00
45f7b020c4
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2020-10-28 05:48:57 -03:00
89aa5852c8
Merge pull request #9226 from Trilbyspaceclone/unmodular_2
...
Unmodulars a few things + new sprite + new welder tank(unused
2020-10-28 05:32:56 -03:00
2c7c66fc89
Merge pull request #9589 from Ghommie/Ghommie-cit259
...
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
cc26593463
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
6378761217
Merge pull request #10522 from Hatterhat/syndi-sleeper
...
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-10-15 18:16:14 -03:00
aa7d47a23b
Examine Code Refactor
2020-10-06 23:36:21 -03:00
631090cf04
Dynamic glidespeed
...
ported from yogstation
2020-10-05 03:58:10 +01:00
615f6d73ae
Size up and down
...
Added a varible that copys with size of the person you strike the envy knife with, along with having SDGF and stabilized cerulean extracts make a clone that copies the holders size.
2020-09-26 19:51:18 -07:00
4d1f86a78e
WITH THE LEMON
...
finally throw combustible into xeno arch, giving a decent amount on the table,
2020-09-24 10:58:02 -07:00
e13cb1e65f
Consume Kudzu
...
Additionally threw in Kudzu at the last minute.
2020-09-24 09:49:23 -07:00
2c4b0b130f
Seeds to Xenoarch
...
More funny seeds found in fossils.
2020-09-24 09:44:48 -07:00
f24e6abb34
Pink and Milk Seeds to Xenoarch
...
This little change is simply removing Pink peppers and Milk Melons away from the unstable mutagen list and instead putting it on the xenoarch artifact being a possible item to discover, compared to drowning a watermelon or pepper in chemicals.
2020-09-24 05:41:02 -07:00
Chemlight