Commit Graph

44614 Commits

Author SHA1 Message Date
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
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
timothyteakettle c506289e6f removes remaining references 2021-09-18 14:24:20 +01:00
timothyteakettle 366bab9dbf removes the passkey 2021-09-18 10:47:50 +01:00
Changelogs bcb914b0e4 Automatic changelog compile [ci skip] 2021-09-18 00:23:36 +00:00
SandPoot 382473eb88 Thicc 2021-09-17 14:15:39 -03:00
CitadelStationBot 0fd21ccb0c Automatic changelog generation for PR #15152 [ci skip] 2021-09-17 05:54:05 -05:00
kiwedespars f3550fd87c blacklists morphine from dart guns, also haloperidol (#15152)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* yeag

* actually adds the blacklist

can't you feel my heart beat so, i can't let you go, want you in my life

* changes

* Update html/changelog.html

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
2021-09-17 12:54:02 +02:00
Changelogs 54ca7efa2b Automatic changelog compile [ci skip] 2021-09-17 00:28:18 +00:00
zerothebigboy ba14896889 balls 2021-09-16 13:05:02 -04:00
zeroisthebiggay 13e110ac43 Update prisoner.dm 2021-09-16 12:03:46 -04:00
Timothy Teakettle 7b2708b12b Update mind_transfer.dm 2021-09-16 15:42:13 +01:00
Timothy Teakettle d1dd46238a Update access.dm 2021-09-16 15:30:39 +01:00
SandPoot f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot 456f68b32b Upload files 2021-09-16 01:05:28 -03:00
CitadelStationBot 6e30018618 Automatic changelog generation for PR #15155 [ci skip] 2021-09-15 21:04:39 -05:00
silicons 4b0281be81 Merge pull request #15155 from DeltaFire15/techweb-fuckywucky
[s] Fixes a major issue regarding techweb hidden nodes
2021-09-15 19:04:37 -07:00
DeltaFire 146682d1ee adds storage protocols to bepis 2021-09-16 03:41:49 +02:00
DeltaFire a4d71fcfa4 -debug comment 2021-09-16 03:18:52 +02:00
DeltaFire b02825c679 uh oh 2021-09-16 03:14:24 +02:00
Changelogs 04a1efd230 Automatic changelog compile [ci skip] 2021-09-16 00:26:56 +00:00
qweq12yt 781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
Changelogs cafe82e531 Automatic changelog compile [ci skip] 2021-09-15 00:25:27 +00:00
silicons fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00