shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,069 Commits 5 Branches 0 Tags
02eb4685a93d2d4be77aa03e1df034fc376a02cb
Commit Graph

1409 Commits

Author SHA1 Message Date
Lin
3f50e836cc Merge pull request #15238 from DeltaFire15/nanitedefibs 
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
 2021-10-05 16:25:59 -07:00
DeltaFire
97eb42b35b defib policy hook & oxyheal 2021-10-04 15:49:12 +02:00
qweq12yt
4e8b02dd75 restored the serving tray to the autholathes 2021-09-27 17:38:28 -03:00
silicons
54993928b2 Merge pull request #15167 from BlueWildrose/regenerativenerf 
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
 2021-09-19 11:08:10 -07:00
silicons
2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage 
Storage nanite designs are no longer inaccessible
 2021-09-19 11:07:13 -07:00
Cognition
37c480a7a4 1 second for self-use 2021-09-17 23:12:55 -07:00
Cognition
cd747b01fe realized I can't place it on tables with how I set it up, woops. 2021-09-17 02:59:31 -07:00
Cognition
db511f4d7e Regenerative extract nerfing 2021-09-17 02:23:06 -07:00
DeltaFire
146682d1ee adds storage protocols to bepis 2021-09-16 03:41:49 +02:00
DeltaFire
a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00
DeltaFire
b02825c679 uh oh 2021-09-16 03:14:24 +02:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
Cognition
a03abc5658 forgot unscrew updating, adds appearance updating to stabilized yellow slime extract 2021-08-28 20:25:43 -07:00
WanderingFox95
6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
WanderingFox95
c1f173d8e6 Decided against locking them behind research 2021-08-17 15:10:33 +02:00
WanderingFox95
631f8dfda5 Clarifies that there are now blank bottles in the research node too. 2021-08-17 14:52:09 +02:00
WanderingFox95
56246d9b56 Adds the bottles to the bottling research tech 2021-08-17 14:28:55 +02:00
WanderingFox95
dc5c107adc Bottles for the service lathe (Equipment) 2021-08-17 14:27:50 +02:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood 
Reworks blood regeneration into something a bit more tame
 2021-08-11 02:54:49 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Artur
d185c5a3e9 Re-adds the badmin nanite hub 2021-07-28 02:13:24 +03:00
Putnam3145
cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
silicons
4653deddec updates 2021-06-28 12:55:22 -07:00
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
Eric
6144e67208 Adds syringes, pillbottles, hyposprays to medical protolathe (#14662) 
* adds pillbottles, syringes, Hyposprays to autolathe

* Adds syringes, pillbottles, and hyposprays to starting techweb

* cuts hyposprays from autolathe

* Makes Hyposprays not shiftstart tech

* Hypospray added to advanced biotech node

* Update code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* removing hyposprays from autolathe designs

* Adds hyposprays to medical designs

* corrects issues with hypospray implementation

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-06-24 20:25:18 +02:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
ad0c3d477e Makes it work proper, hopefully 2021-06-16 01:48:54 +03:00
Artur
795ab3f835 https://github.com/tgstation/tgstation/pull/49798 2021-06-16 01:32:24 +03:00
Artur
096e7d4d67 https://github.com/tgstation/tgstation/pull/49927 2021-06-16 01:31:53 +03:00
Artur
fbcd1a3026 https://github.com/tgstation/tgstation/pull/55883 
With a minor tweak so humans don't benefit
 2021-06-16 01:26:02 +03:00
Artur
ab82766757 https://github.com/tgstation/tgstation/pull/59169 2021-06-16 01:19:48 +03:00
Artur
f33343c6db https://github.com/tgstation/tgstation/pull/56739 2021-06-16 01:17:13 +03:00
Artur
74c186d871 https://github.com/tgstation/tgstation/pull/56516 2021-06-16 01:16:39 +03:00
Artur
a430dc4d4d https://github.com/tgstation/tgstation/pull/56542 2021-06-16 01:16:08 +03:00
Artur
f3e16b298b https://github.com/tgstation/tgstation/pull/56588 2021-06-16 01:15:21 +03:00
Artur
b0d7482f04 https://github.com/tgstation/tgstation/pull/55902 2021-06-16 01:09:30 +03:00
Artur
e2eb9d52d0 https://github.com/tgstation/tgstation/pull/55164 2021-06-16 01:03:51 +03:00
Artur
18aee24231 https://github.com/tgstation/tgstation/pull/54902 2021-06-16 01:01:41 +03:00
Artur
337998e99a https://github.com/tgstation/tgstation/pull/54793 2021-06-16 00:46:05 +03:00