Commit Graph

28967 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
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
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
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test
[Fix] Fixes Space Heater behavior
2021-09-19 11:06:15 -07: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
silicons
a1e27f9ad6 Merge pull request #15144 from zeroisthebiggay/spiteful
bone satchel onmob sprites
2021-09-19 11:05:18 -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
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
SandPoot
382473eb88 Thicc 2021-09-17 14:15:39 -03: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
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
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
qweq12yt
781a414c38 fix space heaters 2021-09-15 18:16:04 -03:00
silicons
fb05100008 Update mouse.dm (#15115) 2021-09-15 00:16:57 +02:00
Putnam3145
cd9b5fb7d8 Makes special objective items delete on reroll 2021-09-14 14:34:41 -07:00
Putnam3145
9a8698230b Added a config entry for monstermos 2021-09-14 14:18:14 -07:00
zerothebigboy
3c60632312 spiteful 2021-09-14 11:01:20 -04:00
Lin
d536d22100 Merge pull request #15109 from Citadel-Station-13/silicons-patch-11
fixes airlocks not unshocking themselves
2021-09-14 01:09:22 -05:00
Lin
4cdee473a4 Merge pull request #15132 from Citadel-Station-13/silicons-patch-17
[03:37:30] Runtime in recycler.dm, line 185: Cannot execute null.forceMove().
2021-09-14 01:08:15 -05: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
ac0fd70b0b Update misc_floor.dm (#15140) 2021-09-14 02:24:15 +02:00
silicons
6524e3d539 Update species.dm (#15126) 2021-09-14 02:23:52 +02:00
silicons
85659a297f Merge pull request #15071 from Putnam3145/remove-bomb-research-cap
Remove arbitrary bomb research cap + tweak formula a little
2021-09-13 15:09:28 -07: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
DeltaFire
d6c9fb3594 Merge remote-tracking branch 'upstream/master' into clockcult-ai-conversion 2021-09-13 22:43:43 +02:00
DeltaFire
6664be64c7 change 2021-09-13 22:34:05 +02:00
Putnam3145
99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
DeltaFire
6b572abd87 Merge remote-tracking branch 'upstream/master' 2021-09-13 20:08:39 +02:00
silicons
47568e50bf Merge pull request #15062 from zeroisthebiggay/patch-18
bread is no longer equipped on the head; instead you actually hold it in your mouth
2021-09-12 21:10:50 -07:00
silicons
e342145663 Merge pull request #15070 from zeroisthebiggay/prisoners
prisoners - aka ports prisoners from tg hell yeah
2021-09-12 20:59:12 -07:00
silicons
4f0d5e8c9a Merge pull request #15112 from Putnam3145/fix-supermatter-cascade
Reworks supermatter gas output to be less cascade-y, more risky
2021-09-12 20:58:48 -07:00
silicons
3a5f6e1649 Merge pull request #15113 from keronshb/unhuboxsm
Stops the SM from blowing things up
2021-09-12 20:58:36 -07:00
silicons
8d72664eef Merge pull request #15123 from keronshb/hitbyfix
Fixes a runtime with Hitby
2021-09-12 20:58:09 -07:00