shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

19184 Commits

Author SHA1 Message Date
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
Putnam3145
a7765aed6f Fixes shoddy math & assumptions causing APCs in sufficiently high-power-requiring rooms to work forever (#14896) 
* Fixes shoddy math & assumptions causing bad

* i typed it. i know it did.
 2021-06-27 16:39:32 +02: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
Lin
3a82712cf9 Merge pull request #14881 from Citadel-Station-13/silicons-patch-42 
fixes silicon examine
 2021-06-23 09:50:11 -07:00
Lin
1b20e46396 Merge pull request #14876 from WanderingFox95/WanderingFox95-LoudCatsurgeon 
[Ready] Cat Surgeon Warning
 2021-06-23 09:49:03 -07:00
Lin
269c845f42 Merge pull request #14877 from Putnam3145/optimize-processing 
inelastic exports no longer uselessly multiply their price by e^0 every tick
 2021-06-22 11:49:39 -07:00
silicons
0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -07:00
DeltaFire
d0fc25bb0e empty lastline 2021-06-21 19:11:49 +02:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam3145
4ff019f56e Inelastic exports shouldn't process 2021-06-21 07:47:13 -07:00
WanderingFox95
49f4ca0d17 Added an announcement. 
Not sure on the exact tone of it,
but this will do for now.
 2021-06-21 16:24:59 +02:00
Lin
9117cc6a5c Merge pull request #14873 from timothyteakettle/vore 
vore href exploit fix
 2021-06-20 16:25:23 -07:00
Timothy Teakettle
0113412190 Update vorepanel.dm 2021-06-19 16:28:52 +01:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
fd0afa209f Merge pull request #14867 from kiwedespars/wheelyheely 
wheely heelies finally have that downside people have been telling me about
 2021-06-18 20:02:23 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
silicons
bc4773b728 Merge pull request #14831 from zeroisthebiggay/beltsprites 
TG Resprite Compendium Atomization Project | Episode Six: Beltslot Sprites & Telebaton Resprite
 2021-06-18 19:58:27 -07:00
Putnam3145
f6b3bce2f3 Merge pull request #14847 from bunny232/21/79-the-revengence 
21/79 not 20/80 the revenge
 2021-06-18 18:52:37 -07:00
Putnam3145
84068b467a Merge pull request #14658 from silicons/backend_sync 
Updates tgui and build backend, fixes the build.bat for those with latest eslint (?)
 2021-06-18 17:23:35 -07:00
keronshb
a192757843 BUG FIX: Changeling Bone Gauntlets work again (#14862) 
* Fixes Bone Gauntlets

* Better fix

* return
 2021-06-18 19:22:48 +02:00
123
20bc2f2f59 Update scooter.dm 2021-06-17 16:16:21 -07:00
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -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
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Lin
84a6467fc9 Merge pull request #14835 from Citadel-Station-13/silicons-patch-37 
Mark datum is now a global verb
 2021-06-14 20:14:05 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
66dde6f9ea woo 2021-06-14 14:00:02 -07:00
silicons
01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
bunny232
03b921a121 Update tank.dm 2021-06-14 06:12:04 -04:00
silicons
6495bbcc81 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-13 16:13:30 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
8224546cfc ok 2021-06-13 15:36:20 -07:00
silicons
e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
zerothebigboy
a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00
silicons
49efd115ee Merge pull request #14832 from zeroisthebiggay/miscsprites 
TG Resprite Compendium Atomization Project | Episode Seven: Misc. Resprites & Distinctive Combat Defibs
 2021-06-13 15:24:30 -07:00