Commit Graph

28793 Commits

Author SHA1 Message Date
silicons
13130b3ee6 Merge pull request #15015 from keronshb/gremlinport
Gremlin Port
2021-08-26 21:40:59 -07:00
silicons
6de44f794e Merge pull request #15010 from Putnam3145/atmos-funnies
Supermatter surge rework: consequential for N2, won't explode immediately for CO2
2021-08-26 21:39:33 -07:00
silicons
841ff4f81c Merge pull request #15011 from Putnam3145/lavaland-random-atmos
Port of randomized planet atmos
2021-08-26 21:39:23 -07:00
silicons
24aedb891e Merge pull request #15012 from Putnam3145/miasma-tweak
Miasma now sterilizes into methane instead of oxygen
2021-08-26 21:39:15 -07:00
silicons
b6688c84bb Merge pull request #15014 from Putnam3145/fix-supermatter-heat
Made supermatter respect heat capacity
2021-08-26 21:39:05 -07:00
silicons
a5afdc88b8 Merge pull request #15021 from Putnam3145/minesweeper-fix
Maybe fixes minesweeper lag without weirdness
2021-08-26 21:38:52 -07:00
silicons
c3e7e91b5b Merge pull request #15027 from Putnam3145/monstermos-planet-disable
Adds a toggle for monstermos doing planet decomp (off by default)
2021-08-26 21:38:39 -07:00
silicons
2c69193337 Merge pull request #15037 from DeltaFire15/corpse-fix
Fixes demons scattering dropped bodies all over the station, plus space dragon content ejection
2021-08-26 21:38:29 -07:00
silicons
c33a684ecf Merge pull request #15038 from zeroisthebiggay/patch-17
removes grilles from maintloot
2021-08-26 21:38:16 -07:00
silicons
d2e9edbb9a Merge pull request #15042 from zeroisthebiggay/sune
sevensune lmao
2021-08-26 21:38:01 -07:00
zerothebigboy
dec2ea645e nuts 2021-08-26 22:57:22 -04:00
zeroisthebiggay
2bc55dad4f Update maintenance_loot.dm 2021-08-26 01:48:10 -04:00
DeltaFire
e87bd464ff sigh 2021-08-26 04:21:52 +02:00
DeltaFire
c713dbdef1 carprift armor 2021-08-26 04:20:23 +02:00
DeltaFire
38aa220e6a no nullijng allowed 2021-08-26 04:02:22 +02:00
DeltaFire
167b9ef331 ae 2021-08-26 03:45:44 +02:00
DeltaFire
6df932c959 *laugh 2021-08-26 03:40:20 +02:00
DeltaFire
f8866774aa no scattering 2021-08-26 03:30:51 +02:00
Lin
3b13a3b898 Merge pull request #15033 from keronshb/CatwalkFlooringPort
Ports Catwalk flooring and gives it a recipe
2021-08-25 17:51:57 -05:00
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
Lin
3f8895e41d Merge pull request #15031 from zeroisthebiggay/patch-16
undoes more Trillby™ Spelling™
2021-08-22 13:19:59 -05:00
Lin
ab7bcd5f4d Merge pull request #15007 from LetterN/revert-14988-openthegates
Old Gateway animation return: now includes less icons
2021-08-21 13:06:22 -05:00
zeroisthebiggay
7b7541b77e Update glassware.dm 2021-08-21 05:51:02 -04:00
zeroisthebiggay
efc5598263 Update code/datums/components/crafting/glassware/lens_crafting.dm
Co-authored-by: MarinaGryphon <jadebishop.2562@gmail.com>
2021-08-20 21:55:54 -04:00
Putnam3145
b26570e288 Adds a toggle for monstermos doing planet decomp (off by default) 2021-08-19 22:10:41 -07:00
zeroisthebiggay
42964392e3 Update lens_crafting.dm 2021-08-19 23:39:05 -04:00
keronshb
0b8221c9ac Change to 20 minutes 2021-08-19 22:49:19 -04:00
Lin
4ae7b63c22 Merge pull request #15019 from WanderingFox95/WanderingFox95-BlankBottles
[Ready] Blank Bottles
2021-08-19 13:22:31 -05:00
Lin
81a41a384c Merge pull request #15008 from WanderingFox95/WanderingFox95-MoreJaggedSharkTails
[Ready] Shark Tails, dodododododo
2021-08-19 12:32:37 -05:00
WanderingFox95
34422662b1 Nerfed the Capacities. 2021-08-18 21:00:56 +02:00
Putnam3145
79f9560135 maybe fixes minesweeper lag without weirdness 2021-08-17 20:47:13 -07:00
WanderingFox95
6c111d89c5 It's back in bottling research, also renamed. 2021-08-17 21:35:30 +02:00
Putnam3145
1d0ca33ca7 fixed ashwalkers still not breathing 2021-08-17 08:48:08 -07:00
WanderingFox95
4691397d03 Adds UNIQUE_RENAME to the bottles.
Thanks Teak!
2021-08-17 16:41:27 +02:00
WanderingFox95
c1f173d8e6 Decided against locking them behind research 2021-08-17 15:10:33 +02:00
keronshb
1b43c5b1ae Merge remote-tracking branch 'upstream/master' into gremlinport 2021-08-17 09:03:09 -04:00
WanderingFox95
631f8dfda5 Clarifies that there are now blank bottles in the research node too. 2021-08-17 14:52:09 +02:00
WanderingFox95
56246d9b56 Adds the bottles to the bottling research tech 2021-08-17 14:28:55 +02:00
WanderingFox95
dc5c107adc Bottles for the service lathe (Equipment) 2021-08-17 14:27:50 +02:00
WanderingFox95
c8889dee36 Bottles. 2021-08-17 14:21:55 +02:00
WanderingFox95
95b63a823b Bottles! 2021-08-17 14:21:11 +02:00
Timothy Teakettle
74595b2845 Update loadout.dm 2021-08-16 18:01:54 +01:00
WanderingFox95
888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
keronshb
45aed7a218 Gremlins 2021-08-15 23:48:24 -04:00
Putnam3145
0f7f11be71 Made supermatter respect heat capacity 2021-08-15 19:43:13 -07:00
silicons
f4658b49b1 Merge pull request #14991 from bunny232/master
Polyvitiligo now actually does something instead of making you a crayon eater.
2021-08-15 00:20:35 -07:00
silicons
2c18d34591 Merge pull request #15005 from BlueWildrose/ihavenomouthandimustslime
Blacklists incapacitated mobs from being sentience event candidates
2021-08-15 00:20:11 -07:00
Lin
048fa1cd18 Merge pull request #15004 from Citadel-Station-13/silicons-patch-3
Admin buildmode repair block now fixes baseturfs instead of simply placing plasteel flooring on empty space
2021-08-15 00:32:19 -05:00
Putnam3145
db2e01d8ae Miasma now sterilizes into methane instead of oxygen 2021-08-14 21:20:50 -07:00
Putnam3145
ff52c241f4 Procedural planet atmos 2021-08-14 21:13:45 -07:00