4653deddec
updates
2021-06-28 12:55:22 -07:00
a73ca4be46
scope creep lmao
2021-06-28 12:29:18 -07:00
392111dc74
Automatic changelog compile [ci skip]
2021-06-28 00:24:16 +00:00
0bfb671f4e
Merge pull request #14482 from silicons/combat_v7
...
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00
0f3bd03a66
Automatic changelog generation for PR #14892 [ci skip]
2021-06-27 13:02:09 -05:00
505fa13631
Merge pull request #14892 from WanderingFox95/WanderingFox95-GooglyEyes
...
[Ready] Googly Eyes! (Hydroponics)
2021-06-27 11:02:07 -07:00
5818c35604
Automatic changelog generation for PR #13991 [ci skip]
2021-06-27 13:01:35 -05:00
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
11ce23ae79
Automatic changelog generation for PR #14896 [ci skip]
2021-06-27 09:39:34 -05:00
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
bfcefc75fa
Automatic changelog compile [ci skip]
2021-06-27 00:26:23 +00:00
d2dc56123d
Minor backend cleanup
2021-06-26 07:13:17 -07:00
6d4d70298d
Wow It's Been At Double Speed
2021-06-25 07:30:27 -07:00
b22944cde6
minor optimizations
2021-06-25 06:54:36 -07:00
1ad824b72d
Automatic changelog compile [ci skip]
2021-06-25 00:25:05 +00:00
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
ca70d8afa4
Automatic changelog generation for PR #14891 [ci skip]
2021-06-24 16:45:13 -05:00
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
0c5aa60878
Automatic changelog generation for PR #14662 [ci skip]
2021-06-24 13:25:20 -05:00
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
7bf2246d26
Some baffling optimizations
2021-06-24 07:03:18 -07:00
6dcb54afe2
Walkingshrooms, your number 1 source of GOOGLY EYES
2021-06-24 14:56:42 +02:00
5e650075d4
Googly eyes.
2021-06-24 14:56:05 +02:00
9c2e3001dd
Adds googly eyes as an overlay to the sprites
2021-06-24 14:54:51 +02:00
cbf0074383
Automatic changelog compile [ci skip]
2021-06-24 00:17:55 +00:00
084ec04782
Update engine_sm_5x5.dmm
2021-06-23 12:51:30 -04:00
3a82712cf9
Merge pull request #14881 from Citadel-Station-13/silicons-patch-42
...
fixes silicon examine
2021-06-23 09:50:11 -07:00
86fc115522
Automatic changelog generation for PR #14876 [ci skip]
2021-06-23 11:49:06 -05:00
1b20e46396
Merge pull request #14876 from WanderingFox95/WanderingFox95-LoudCatsurgeon
...
[Ready] Cat Surgeon Warning
2021-06-23 09:49:03 -07:00
c3db2ed8ab
Fixes the varedit interface
2021-06-23 01:34:47 -07:00
f1cf32d0b5
okay, we DO have to check if it's not null
2021-06-22 23:13:48 -07:00
b5e38ba4b3
Update engine_teg.dmm
2021-06-23 02:07:59 -04:00
85eef816a7
actually makes the default gas damage work, whoops
2021-06-22 22:48:44 -07:00
37fe5f297c
fix double . in fusion scan
2021-06-22 22:38:20 -07:00
18a0cab792
Makes closed turfs get removed from atmos adjacent.
2021-06-22 20:36:47 -07:00
37207416e1
Automatic changelog compile [ci skip]
2021-06-23 00:22:43 +00:00
5fd65bb772
Automatic changelog generation for PR #14877 [ci skip]
2021-06-22 13:49:41 -05:00
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
f31180e655
Automatic changelog generation for PR #14880 [ci skip]
2021-06-22 13:49:16 -05:00
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
0dd8c03286
Update examine.dm
2021-06-21 17:43:05 -07:00
ba9f2b7c48
Automatic changelog compile [ci skip]
2021-06-22 00:22:24 +00:00
51f680bbed
Automatic changelog generation for PR #14870 [ci skip]
2021-06-21 12:12:54 -05:00
be3260f7a6
Merge pull request #14870 from bunny232/metaxenodoor
...
Metastation xenobiology pen door
2021-06-21 10:12:51 -07:00
d0fc25bb0e
empty lastline
2021-06-21 19:11:49 +02:00
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
38c7120502
Automatic changelog generation for PR #14850 [ci skip]
2021-06-21 10:54:58 -05:00
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
4ff019f56e
Inelastic exports shouldn't process
2021-06-21 07:47:13 -07:00
silicons