Commit Graph

20066 Commits

Author SHA1 Message Date
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
silicons
35948bec02 Merge pull request #15162 from zeroisthebiggay/patch-23
prisoners cannot latejoin anymore
2021-09-19 11:06:40 -07:00
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07: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
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
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
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix
Fixes Plague Rats + other buffs
2021-09-19 11:03:05 -07:00
keronshb
6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04: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
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
silicons
849dbc7fb3 sigh 2021-09-18 19:37:24 -07:00
zerothebigboy
4c82eeeb2a soup 2021-09-18 18:18:04 -04: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
buffyuwu
bdf46b1d46 meme pr 2021-09-18 04:53:17 -04:00
Cognition
37c480a7a4 1 second for self-use 2021-09-17 23:12:55 -07:00
buffyuwu
96643c7aba probably fixes holoparasites
closes #15151 if it works
2021-09-18 01:22:24 -04:00
silicons
ae513d3114 feautre 2021-09-17 21:58:26 -07:00
Putnam3145
b5890f60a7 Massively reduced oxygen req for bonfire 2021-09-17 15:50:20 -07:00
DeltaFire
3f1d060a38 hey raspy why can plastic golems always ventcrawl 2021-09-17 21:02:58 +02: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
Cognition
cd747b01fe realized I can't place it on tables with how I set it up, woops. 2021-09-17 02:59:31 -07:00
Cognition
db511f4d7e Regenerative extract nerfing 2021-09-17 02:23:06 -07:00
Putnam3145
ce0107dfdf effective temperature for power increase too 2021-09-16 21:49:43 -07:00
keronshb
518c54c061 Adds the correct hijack 2021-09-16 15:52:53 -04:00
buffyuwu
7dbcc81fd3 whoops 2021-09-16 14:23:21 -04:00
buffyuwu
43cd462d79 saltpr adding more suit slot clothing
adds three suit slot clothing items. the hoodies remade from the unused(?) hoodieskirt asset and the heartcoat comes from a redesign of the bartender's winter coat
2021-09-16 14:19:23 -04:00
keronshb
095a803cc5 linter fixes 2021-09-16 13:51:39 -04:00
keronshb
792dc073b3 Final fixes? 2021-09-16 13:28:34 -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
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
keronshb
f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
qweq12yt
781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
keronshb
edde5043dd More fixes, more errors 2021-09-15 15:55:59 -04:00
keronshb
4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00
keronshb
7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
silicons
fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
silicons
7c918d0f79 Update prisoner.dm 2021-09-14 15:11:58 -07:00
Lin
d53820d9bf Merge pull request #15130 from Citadel-Station-13/when_why
[02:58:00] Runtime in atoms.dm, line 574: type mismatch: "catghost" &= 16777215
2021-09-14 01:08:06 -05:00
silicons
4af82878dc Update uplink_ammo.dm (#15141) 2021-09-14 02:24:37 +02:00
silicons
6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
silicons
faed0eff01 Merge pull request #15099 from Hatterhat/tablets-gaming
tablets gaming - an NT IRN "buff"
2021-09-13 15:09:04 -07:00
silicons
abbd3d7708 Merge pull request #15120 from LetterN/what-if-i-updated-mafia-yeah-right
Mafia updates
2021-09-13 15:08:50 -07:00
DeltaFire
f7bcfa57ae safety 2021-09-13 23:28:02 +02:00
DeltaFire
a0fa118415 unfucks changes 2021-09-13 22:48:16 +02:00