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

43568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
CitadelStationBot
11ce23ae79 Automatic changelog generation for PR #14896 [ci skip] 2021-06-27 09:39:34 -05: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
Changelogs
bfcefc75fa Automatic changelog compile [ci skip] 2021-06-27 00:26:23 +00:00
Changelogs
1ad824b72d Automatic changelog compile [ci skip] 2021-06-25 00:25:05 +00:00
Lin
2064da4842 Merge pull request #14887 from MrJWhit/teg-reinforced-floors 
Swapping some floors on the TEG-map
 2021-06-24 14:45:53 -07:00
CitadelStationBot
ca70d8afa4 Automatic changelog generation for PR #14891 [ci skip] 2021-06-24 16:45:13 -05:00
Lin
13572fd109 Merge pull request #14891 from MrJWhit/random-5x5-SM-fix 
The most important map update for the 5x5 SM.
 2021-06-24 14:45:11 -07:00
CitadelStationBot
0c5aa60878 Automatic changelog generation for PR #14662 [ci skip] 2021-06-24 13:25:20 -05: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
Changelogs
cbf0074383 Automatic changelog compile [ci skip] 2021-06-24 00:17:55 +00:00
MrJWhit
084ec04782 Update engine_sm_5x5.dmm 2021-06-23 12:51:30 -04: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
CitadelStationBot
86fc115522 Automatic changelog generation for PR #14876 [ci skip] 2021-06-23 11:49:06 -05:00
Lin
1b20e46396 Merge pull request #14876 from WanderingFox95/WanderingFox95-LoudCatsurgeon 
[Ready] Cat Surgeon Warning
 2021-06-23 09:49:03 -07:00
MrJWhit
b5e38ba4b3 Update engine_teg.dmm 2021-06-23 02:07:59 -04:00
Changelogs
37207416e1 Automatic changelog compile [ci skip] 2021-06-23 00:22:43 +00:00
CitadelStationBot
5fd65bb772 Automatic changelog generation for PR #14877 [ci skip] 2021-06-22 13:49:41 -05: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
CitadelStationBot
f31180e655 Automatic changelog generation for PR #14880 [ci skip] 2021-06-22 13:49:16 -05:00
Lin
0a25792663 Merge pull request #14880 from DeltaFire15/14860-fixes 
Fixes a bunch of things and some related should not sleeps because they make the CI cry
 2021-06-22 11:49:13 -07:00
silicons
0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -07:00
Changelogs
ba9f2b7c48 Automatic changelog compile [ci skip] 2021-06-22 00:22:24 +00:00
CitadelStationBot
51f680bbed Automatic changelog generation for PR #14870 [ci skip] 2021-06-21 12:12:54 -05:00
Lin
be3260f7a6 Merge pull request #14870 from bunny232/metaxenodoor 
Metastation xenobiology pen door
 2021-06-21 10:12:51 -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
CitadelStationBot
38c7120502 Automatic changelog generation for PR #14850 [ci skip] 2021-06-21 10:54:58 -05:00
silicons
98ff06fa1a the roasted roasted roasted roasted roasted roasted roasted roasted......... (#14850) 
* Update misc.dm

* Update code/game/objects/items/melee/misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* Update misc.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2021-06-21 17:54:56 +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
Changelogs
19e44efef1 Automatic changelog compile [ci skip] 2021-06-21 00:24:03 +00:00
CitadelStationBot
bd1344b4b2 Automatic changelog generation for PR #14872 [ci skip] 2021-06-20 18:26:23 -05:00
Lin
3a914072b5 Merge pull request #14872 from Citadel-Station-13/silicons-patch-40 
it turns out i accidentally buffed glowshrooms by a factor of 21. this should probably be fixed.
 2021-06-20 16:26:21 -07:00
CitadelStationBot
8a81fa7d79 Automatic changelog generation for PR #14873 [ci skip] 2021-06-20 18:25:25 -05:00
Lin
9117cc6a5c Merge pull request #14873 from timothyteakettle/vore 
vore href exploit fix
 2021-06-20 16:25:23 -07:00
silicons
29604b939c Update glowshroom.dm 2021-06-20 13:18:54 -07:00
Changelogs
0a1f0d3e66 Automatic changelog compile [ci skip] 2021-06-20 00:24:26 +00:00
Timothy Teakettle
0113412190 Update vorepanel.dm 2021-06-19 16:28:52 +01:00
CitadelStationBot
ab9a776690 Automatic changelog generation for PR #14863 [ci skip] 2021-06-19 09:04:51 -05:00
silicons
0cfe2ec4ca Merge pull request #14863 from miniusAreas/fdmm-patch-28485128-miniusAreas 
Various Fixes (freelance)
 2021-06-19 07:04:48 -07:00
silicons
8f3c1fe03a Update glowshroom.dm 2021-06-19 07:02:51 -07:00
silicons
c0e3af55bc Update glowshroom.dm 2021-06-19 06:59:26 -07:00
CitadelStationBot
0067cc2b6e Automatic changelog generation for PR #14734 [ci skip] 2021-06-18 22:03:46 -05:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
CitadelStationBot
de26ea4a20 Automatic changelog generation for PR #14867 [ci skip] 2021-06-18 22:02:25 -05: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
ae6a648c4b Merge pull request #14869 from bunny232/21/79-the-finale 
21/79 the finale now with less map merge issues woops
 2021-06-18 20:02:07 -07:00
CitadelStationBot
2fa8136e6a Automatic changelog generation for PR #14860 [ci skip] 2021-06-18 22:01:08 -05: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