Commit Graph

44673 Commits

Author SHA1 Message Date
WanderingFox95 42eee00aec Fix? 2021-09-19 21:25:51 +02:00
CitadelStationBot 5aea7175ea Automatic changelog generation for PR #15074 [ci skip] 2021-09-19 13:12:05 -05:00
silicons c60e54e0d3 Merge pull request #15074 from keronshb/paiports
PORTS PAI Emag Act
2021-09-19 11:12:02 -07:00
silicons c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination
meme pr that adds a hallunciation sound
2021-09-19 11:11:05 -07:00
CitadelStationBot eff5f97020 Automatic changelog generation for PR #15174 [ci skip] 2021-09-19 13:10:47 -05:00
silicons f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites
probably fixes holoparasites
2021-09-19 11:10:45 -07:00
CitadelStationBot 88428d248b Automatic changelog generation for PR #15133 [ci skip] 2021-09-19 13:10:31 -05:00
silicons 2c8d362dd5 Merge pull request #15133 from zeroisthebiggay/patch-21
the timeframely tips update
2021-09-19 11:10:28 -07:00
CitadelStationBot da2ca355f1 Automatic changelog generation for PR #15094 [ci skip] 2021-09-19 13:09:57 -05:00
silicons 8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20
removes building (fortnite) windows
2021-09-19 11:09:55 -07:00
CitadelStationBot 608cb77919 Automatic changelog generation for PR #15176 [ci skip] 2021-09-19 13:09:09 -05:00
silicons a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper
fixes dogborg sleepers not working
2021-09-19 11:09:06 -07:00
CitadelStationBot 20feb1b3aa Automatic changelog generation for PR #15178 [ci skip] 2021-09-19 13:09:03 -05:00
silicons 97213c94d8 Merge pull request #15178 from zeroisthebiggay/soup
all medipens get inhands
2021-09-19 11:09:01 -07:00
silicons ae1b7803fa Merge pull request #15172 from Putnam3145/bonfire-always-works-lavaland
Massively reduced oxygen req for bonfire
2021-09-19 11:08:56 -07:00
CitadelStationBot e4f610b1e8 Automatic changelog generation for PR #15171 [ci skip] 2021-09-19 13:08:48 -05:00
silicons 9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry
Hey raspy why can plastic golems ventcrawl even with equipment?
2021-09-19 11:08:45 -07:00
CitadelStationBot c40215437e Automatic changelog generation for PR #15169 [ci skip] 2021-09-19 13:08:42 -05:00
silicons a6637584a7 Merge pull request #15169 from timothyteakettle/REDACTED
adds a new mild trauma
2021-09-19 11:08:40 -07:00
zeroisthebiggay 86c8129935 Update sillytips.txt 2021-09-19 14:08:32 -04:00
CitadelStationBot dfe311aa80 Automatic changelog generation for PR #15168 [ci skip] 2021-09-19 13:08:20 -05:00
silicons 516f5ba81f Merge pull request #15168 from dapnee/map-fixies
Pubby and Beach Away Fixes
2021-09-19 11:08:17 -07:00
CitadelStationBot 5b735ea70f Automatic changelog generation for PR #15167 [ci skip] 2021-09-19 13:08:12 -05:00
silicons 54993928b2 Merge pull request #15167 from BlueWildrose/regenerativenerf
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
2021-09-19 11:08:10 -07:00
keronshb 1f71740803 . 2021-09-19 14:08:01 -04:00
silicons 9ac585c7f4 Merge pull request #15166 from Putnam3145/wider-effective-temperature
Supermatter has capped effective temperature for power increase too
2021-09-19 11:07:45 -07:00
CitadelStationBot 74c732122c Automatic changelog generation for PR #15163 [ci skip] 2021-09-19 13:07:34 -05:00
silicons abb89d9af0 Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
2021-09-19 11:07:32 -07:00
CitadelStationBot 2f5d31409b Automatic changelog generation for PR #15156 [ci skip] 2021-09-19 13:07:26 -05:00
silicons 946e718429 Merge pull request #15156 from zeroisthebiggay/canwepretendthattheairplanesinthenightskyareshootingstars
fixes madness mask sprites
2021-09-19 11:07:24 -07:00
CitadelStationBot 99216a653a Automatic changelog generation for PR #15157 [ci skip] 2021-09-19 13:07:15 -05:00
silicons 2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage
Storage nanite designs are no longer inaccessible
2021-09-19 11:07:13 -07:00
silicons 1c22d85061 Merge pull request #15158 from SandPoot/obscured-slots
Adds obscured slots and TRAIT_NODROP checks to the outline system
2021-09-19 11:07:08 -07:00
CitadelStationBot e51d767c43 Automatic changelog generation for PR #15160 [ci skip] 2021-09-19 13:07:04 -05:00
silicons 9d02cf4734 Merge pull request #15160 from timothyteakettle/xor-update
removes passkey from access circuits as it's not used anymore
2021-09-19 11:07:02 -07:00
silicons df4732a6e6 Merge pull request #15161 from timothyteakettle/prefbreaking-is-bad
the mind transfer spell now releases people from vore bellies prior to the mind transfer
2021-09-19 11:06:51 -07:00
CitadelStationBot f960fe7f28 Automatic changelog generation for PR #15162 [ci skip] 2021-09-19 13:06:42 -05:00
silicons 35948bec02 Merge pull request #15162 from zeroisthebiggay/patch-23
prisoners cannot latejoin anymore
2021-09-19 11:06:40 -07:00
silicons e50125ca6b Merge pull request #15150 from Putnam3145/hacked-law-self-qdel
Makes special objective items delete on reroll
2021-09-19 11:06:29 -07:00
CitadelStationBot 2910ff7b1d Automatic changelog generation for PR #15154 [ci skip] 2021-09-19 13:06:18 -05:00
silicons c04f0cb953 Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07:00
CitadelStationBot df618fd524 Automatic changelog generation for PR #15147 [ci skip] 2021-09-19 13:06:03 -05:00
silicons 6db4fc303f Merge pull request #15147 from Putnam3145/monstermos-config
Adds a config entry for monstermos (disabled for now)
2021-09-19 11:06:00 -07:00
CitadelStationBot 4eacb4118f Automatic changelog generation for PR #15144 [ci skip] 2021-09-19 13:05:20 -05:00
silicons a1e27f9ad6 Merge pull request #15144 from zeroisthebiggay/spiteful
bone satchel onmob sprites
2021-09-19 11:05:18 -07:00
CitadelStationBot 13110dde49 Automatic changelog generation for PR #15143 [ci skip] 2021-09-19 13:05:07 -05:00
silicons fbea148ce5 Merge pull request #15143 from zeroisthebiggay/prisonfix
fixes box perma not being connected to power; some small touch ups other than that also
2021-09-19 11:05:05 -07:00
CitadelStationBot 06cb2646ee Automatic changelog generation for PR #15139 [ci skip] 2021-09-19 13:05:01 -05:00
silicons ffa1355a33 Merge pull request #15139 from DeltaFire15/catsurgeon-badspawn
The cat surgeon event now prefers using "safe" turfs as spawn location
2021-09-19 11:04:59 -07:00
CitadelStationBot 3d8ac07f0e Automatic changelog generation for PR #15137 [ci skip] 2021-09-19 13:04:52 -05:00