Commit Graph

44650 Commits

Author SHA1 Message Date
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
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
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
silicons
c16f29ffb2 Merge pull request #15137 from DeltaFire15/clockcult-ai-conversion
Allows clock cultists to convert carded AIs by placing their card onto a conversion sigil
2021-09-19 11:04:50 -07:00
CitadelStationBot
acd60b0420 Automatic changelog generation for PR #15134 [ci skip] 2021-09-19 13:04:34 -05:00
silicons
6a4c8dfc4d Merge pull request #15134 from zeroisthebiggay/patch-22
more brain trauma lines for genuinely no reason other than they're funny
2021-09-19 11:04:32 -07:00
CitadelStationBot
c8277c90dd Automatic changelog generation for PR #15119 [ci skip] 2021-09-19 13:03:20 -05:00
silicons
d90483c428 Merge pull request #15119 from keronshb/slaughterbuff
Fixes Slaughter Demon, gives it an action button, and a slight buff
2021-09-19 11:03:18 -07:00
CitadelStationBot
3d12cdab24 Automatic changelog generation for PR #15084 [ci skip] 2021-09-19 13:03:07 -05:00
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
buffyuwu
8a207d7ebd three more loadout clothing items
made from (many) edits to the gothcoat and blackwizard clothing items respectively
2021-09-19 03:01:02 -04:00
zerothebigboy
9af0d9c8f2 wiresandshityeah 2021-09-18 22:39:02 -04:00
Changelogs
a6e3cd7976 Automatic changelog compile [ci skip] 2021-09-19 00:26:42 +00:00
zerothebigboy
626047d6b8 soup 2021-09-18 18:30:59 -04:00
zerothebigboy
4c82eeeb2a soup 2021-09-18 18:18:04 -04:00
dapnee
d59c933fde even more shit
pubby now has a court room and some other misc. things that will make certain areas a bit less boring
2021-09-18 16:13:57 -06:00