Commit Graph

717 Commits

Author SHA1 Message Date
QuoteFox
88bf85f2ea Merge pull request #619 from ArchieBeepBoop/fixesyee
Seemingly Fixes the offset blood overlay
2020-10-27 02:35:50 +00:00
QuoteFox
6d9b78d4e6 Merge pull request #620 from ArchieBeepBoop/penfix
Fixes the Sleepy Pen and Missing Reagent.
2020-10-27 02:35:32 +00:00
ToonClyde
4207015199 CitRP Fluffy Jackets 2020-10-26 14:30:59 -07:00
Dip
6abb884fa4 fixes the sleepy pen and an invalid reagent 2020-10-26 18:11:06 -03:00
deathride58
d9db5e0aa9 Merge pull request #9246 from Linzolle/taur
some missing icons + sprite changes for taur suits
2020-10-25 21:18:42 -03:00
Dip
124bf72657 more runtimes, fixes wrong gibs and blood 2020-10-24 02:23:06 -03:00
Dip
e162b8c36f fixes invisible skellingtons 2020-10-24 00:02:45 -03:00
Dip
5470fdd25c squashing some runtimes 2020-10-23 21:15:06 -03:00
Dahlular
7aa0fccefa Merge pull request #608 from Kabramen/prosthetic-limb-quirk-revamp
Ports selectable prostethic limbs from Yog + quirk blacklist and two o…
2020-10-23 16:27:54 -06:00
Dahlular
3be0cb650a Merge pull request #607 from ArchieBeepBoop/becomemodular
Oh boy, it's another one of Archie's mini packs. - Energy Harvester, HoS Pet Port and a micro carp buff.
2020-10-23 16:25:53 -06:00
Dahlular
d82c9304f4 Merge pull request #604 from ArchieBeepBoop/master
[SPEEDMERGE] Fixes misaligned HE pipes & Listening Post Duplicates + TEG Burn chamber Optimizations
2020-10-23 16:24:29 -06:00
Dip
61fad3f3de debuff carps, dormammu has not accepted bargain 2020-10-23 19:18:03 -03:00
Dip
dc0a988d6c Energy Harvester V1 2020-10-23 05:55:58 -03:00
Kabra_men
64ee851bdf Ports selectable prostethic limb from Yog + quirk blacklist and two other new quirks 2020-10-22 01:23:27 -03:00
Dip
ddcf4e1434 Adds petting element to Lia and Cayenne, alongside mob holder. 2020-10-20 03:14:45 -03:00
Dip
9d8a729c51 Ports Lia / Micro Carp Buff? 2020-10-20 02:46:13 -03:00
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
Dip
8004fdc3e2 pipefix 2020-10-18 00:54:21 -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