Commit Graph

44543 Commits

Author SHA1 Message Date
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
Changelogs
a6e3cd7976 Automatic changelog compile [ci skip] 2021-09-19 00:26:42 +00:00
Changelogs
bcb914b0e4 Automatic changelog compile [ci skip] 2021-09-18 00:23:36 +00: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
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
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
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
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
Changelogs
bde0e54eb6 Automatic changelog compile [ci skip] 2021-09-14 00:26:53 +00:00
silicons
8bb364df0a fix (#15128) 2021-09-14 02:25:10 +02: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
CitadelStationBot
6ce75c57d7 Automatic changelog generation for PR #15071 [ci skip] 2021-09-13 17:09:31 -05: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
CitadelStationBot
1fe1d2582e Automatic changelog generation for PR #15099 [ci skip] 2021-09-13 17:09:07 -05: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
CitadelStationBot
17b3c3db2a Automatic changelog generation for PR #15120 [ci skip] 2021-09-13 17:08:52 -05: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
silicons
a1eaab5446 Merge pull request #15136 from Citadel-Station-13/revert-15112-fix-supermatter-cascade
Revert "Reworks supermatter gas output to be less cascade-y, more risky"
2021-09-13 12:02:50 -07:00
Putnam3145
99908e17c5 Revert "Reworks supermatter gas output to be less cascade-y, more risky" 2021-09-13 11:39:32 -07:00
CitadelStationBot
7a4d1042e6 Automatic changelog generation for PR #15062 [ci skip] 2021-09-12 23:10:53 -05: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
CitadelStationBot
bb6f4b0c1d Automatic changelog generation for PR #15070 [ci skip] 2021-09-12 22:59:15 -05: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
CitadelStationBot
78657bb0de Automatic changelog generation for PR #15113 [ci skip] 2021-09-12 22:58:38 -05: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
CitadelStationBot
401159bbec Automatic changelog generation for PR #15123 [ci skip] 2021-09-12 22:58:11 -05:00
silicons
8d72664eef Merge pull request #15123 from keronshb/hitbyfix
Fixes a runtime with Hitby
2021-09-12 20:58:09 -07:00
CitadelStationBot
ff2a63c5fe Automatic changelog generation for PR #15124 [ci skip] 2021-09-12 22:58:00 -05:00
silicons
a0ad386b59 Merge pull request #15124 from zeroisthebiggay/why
adrenals are actually useful plus fixes all speedups
2021-09-12 20:57:58 -07:00
silicons
fcac5fa3c0 Update recycler.dm 2021-09-12 20:40:25 -07:00
silicons
4c058114a6 Update login.dm 2021-09-12 20:37:03 -07:00
Changelogs
45895c52e6 Automatic changelog compile [ci skip] 2021-09-13 00:27:21 +00:00
Putnam3145
137a30a047 more nerfs lol 2021-09-12 15:04:42 -07:00
zerothebigboy
d41648b365 dumbasskevinz 2021-09-11 23:34:02 -04:00
zerothebigboy
223ba8d6c1 why 2021-09-11 23:20:01 -04:00
zerothebigboy
f077f374bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why 2021-09-11 23:04:48 -04:00