Commit Graph

700 Commits

Author SHA1 Message Date
Dip
a479698c95 just in case this becomes a problem 2020-10-18 17:53:40 -03:00
Dip
9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular
7586bd96c6 Merge pull request #601 from Chemlight/X-01_Buff
X-01 MultiPhase Energy Gun Buff
2020-10-18 13:24:38 -06:00
Dahlular
d0d9927b96 Merge pull request #599 from ArchieBeepBoop/becomemodular
SHITCODE: BECOME MODULAR
2020-10-18 13:23:38 -06:00
Dahlular
441f1cd449 Merge pull request #600 from Jay-Sparrow/Dynamic2
More dynamic
2020-10-18 13:22:15 -06:00
Dip
6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
Dip
8a911e0064 RUNTIIIIME 2020-10-18 04:04:01 -03:00
kevinz000
2e75188a0b Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
2020-10-18 00:03:22 -03:00
Dip
c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
Dip
682eb7b9b6 gotta make sure this works yo 2020-10-17 22:25:29 -03:00
deathride58
cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
Chemlight
5174ab881a X-01 MultiPhase Energy Gun Buff
Increased the charge capacity of the X-01's blaster by 60% along with it's charge capacity, allowing 16 lethal shots, 40 disabler, or 16 stun shots. Origionally the stun energy cost was at a whole 200 charge reduction , now being 100 to represent the power in comparison to a tactical energy gun that spent half the amount of energy in comparison.
2020-10-17 00:03:31 -07:00
JaySparrow
c3d33c363c Nukies
fix da nukie
2020-10-16 19:10:28 -05:00
Dip
a8367fa0e4 safety measures 2020-10-16 21:02:18 -03:00
Dip
fa20d21b96 SHITCODE: BECOME MODULAR 2020-10-16 18:41:40 -03:00
Vladin
5504a9e9da I was going to be a nurse but I don't like asking permission
saved 2 people ran over 40 lets fucking gooooooooo
2020-10-16 15:52:43 -04:00
QuoteFox
1c151faf05 Merge pull request #590 from ArchieBeepBoop/radiationfixes
Radiation runtime fix, collector balance tweak, Machinery Alt Click, jukeboxes finally work, turrets no longer target megafauna, etc
2020-10-16 12:32:49 +01:00
QuoteFox
5ceb438065 Merge pull request #592 from ArchieBeepBoop/pipes
Port TG Pipe Layers updates, Freezer Layer Update and RPD icon reorder
2020-10-16 12:32:05 +01:00
QuoteFox
cbfb5e5700 Merge pull request #593 from ArchieBeepBoop/medibottipping
Ports the Medbot Tipping Update, you monster.
2020-10-16 12:31:36 +01:00
kevinz000
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
kevinz000
c952c3ecff Upgrade able Medical bot and Floor bot as well! + Clean bot fix! (#12112)
* Misstake are now

* Still dosnt all work

* no more range upgrade it just dosnt work

* bithell

* a this
2020-10-15 01:56:47 -03:00
Dip
618175ab42 PAI redundancy 2020-10-15 00:10:39 -03:00
Archie
f6c0bf946b prob change (was this ever working?) 2020-10-14 17:44:43 -03:00
Ghom
382c9269ef Merge pull request #10775 from r4d6/fix
Fix HE Manifold Sprites, for good. [Speedmerge please]
2020-10-14 02:40:51 -03:00
Putnam3145
3fc99b8a83 Merge pull request #10718 from r4d6/HE-Fix
Fix HE Manifold's sprites
2020-10-14 02:40:40 -03:00
kevinz000
f6c62c57ba Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
2020-10-14 02:34:25 -03:00
Archie
1136f0f31a prevents off-z appendicitis 2020-10-14 00:41:15 -03:00
Dip
f0bf81cb1f Runtimes and balance 2020-10-13 06:10:12 -03:00
Dahlular
688617d631 Merge pull request #589 from ArchieBeepBoop/interfacefix2
No ID Insertion, Fire Alarms Fix, ORM Fix, Sleeper Reagent Upgrade, Volume Based Filters, 5x5 SM Fix (THE FIXENING™)
2020-10-13 00:21:59 -06:00
Dahlular
cb4d7f6cd9 Merge pull request #588 from Jay-Sparrow/Dynamic2
Dynamic fixes
2020-10-13 00:18:04 -06:00
Lin
60b9557f42 Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2020-10-13 02:11:31 -03:00
kevinz000
8408c6669f Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2020-10-13 01:26:13 -03:00
JaySparrow
a661c1d42b Forgot the chaos level
aaaaa
2020-10-12 21:55:38 -05:00
Lin
e0d9a3b354 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
JaySparrow
ebf705f33e Dynamic Tweaks
Just work damn you
2020-10-12 21:32:32 -05:00
kevinz000
533a39d199 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2020-10-12 21:01:54 -03:00
JaySparrow
e536168d4f Changeling Fix
Size and clothesplosion
2020-10-12 18:04:56 -05:00
QuoteFox
92d1fbaf1f Merge pull request #570 from ArchieBeepBoop/enginemapfixes
Some map fixes + changes
2020-10-12 15:35:06 +01:00
Ghom
5a0991e7e1 Merge pull request #10606 from r4d6/patch-2
Update the Passive Vents that I added
2020-10-11 19:26:08 -03:00
Ghom
7c0c874db7 Merge pull request #10722 from Putnam3145/fix-relief
Relief valve fixes
2020-10-11 19:25:09 -03:00
Ghom
473d2944d3 Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
2020-10-11 19:07:29 -03:00
Ghom
3d7ab5c63d Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
2020-10-11 19:06:36 -03:00
Dahlular
78f702f74e Merge pull request #578 from ToonClyde/Mmmm-yes-Carbon-Nanotubes
tasty carbon nanotube noodles
2020-10-10 23:28:33 -06:00
Dahlular
e2e313b3ed Merge pull request #571 from ArchieBeepBoop/shuttleloanfixes
Shuttle Loan Fixes
2020-10-10 23:19:46 -06:00
Dip
06f95d9668 who the fuck thought this was a good idea 2020-10-10 23:13:47 -03:00
ToonClyde
19de1094e0 tasty carbon nanotube noodles 2020-10-10 18:07:51 -07:00
Dip
2381dd7504 belt + typo fix 2020-10-10 17:42:10 -03:00
QuoteFox
4f9dcf8a83 Merge pull request #573 from ArchieBeepBoop/teg_crate
TEG Cargo Crate
2020-10-10 07:48:20 +01:00
ToonClyde
4cb2430518 Deer Rework 2020-10-09 02:16:08 -07:00
Dip
73aed90893 HMMMM 2020-10-09 03:19:08 -03:00