Commit Graph

19184 Commits

Author SHA1 Message Date
Putnam
1f8b7cda94 Uncaps TEG 2021-03-02 03:04:45 -08:00
Putnam
291fc2add6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into supernova 2021-03-02 01:33:22 -08:00
Putnam
38fb75c235 Prevents bloodsucker daytime-soon spam 2021-03-02 01:20:22 -08:00
Letter N
6514f4034c a 2021-03-02 12:57:26 +08:00
Hatterhat
80469a32f9 WHY WON'T YOU HIDE CORRECTLY 2021-03-01 22:33:21 -06:00
Letter N
364381937f fix+disallows admins rigging votes 2021-03-02 10:18:30 +08:00
silicons
1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming
Changes to ash drake transformation
2021-03-01 18:42:28 -07:00
dzahlus
ca1fe9d6c0 Update shapeshift.dm
for keb
2021-03-02 02:40:23 +01:00
silicons
b5bb90ecf8 Merge pull request #14290 from SandPoot/properlegioninheritance
Legions pass their type to the mob they infect
2021-03-01 18:35:37 -07:00
silicons
7af3c986ad Merge pull request #14328 from R3dtail/patch-3
Makes Clownification Less Abysmal :honk:
2021-03-01 18:32:29 -07:00
silicons
6c6ebb3002 Merge pull request #14342 from MarinaGryphon/patch-1
Fixes #14341
2021-03-01 18:31:25 -07:00
silicons
dea79157dd Merge pull request #14295 from Putnam3145/fusion
Removes open-air fusion completely.
2021-03-01 18:30:27 -07:00
silicons
3d417167c6 Merge pull request #14307 from Putnam3145/supermatter-events
Adds a new event: supermatter surge
2021-03-01 18:27:51 -07:00
silicons
0612451aef Merge pull request #14320 from Putnam3145/valentine-removal
Removes auto-matchmaking from valentine's event
2021-03-01 18:27:07 -07:00
silicons
c23db5daee Merge pull request #14327 from qweq12yt/pacifist-zombo-fix
fixes pacifist zombies
2021-03-01 18:26:16 -07:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
dzahlus
f206213603 60 second cooldown instead of 3 minutes 2021-03-01 22:16:23 +01:00
Timothy Teakettle
03883183ad make arachnid available roundstart 2021-03-01 21:12:08 +00:00
Timothy Teakettle
9c3f7cbad6 no 2021-03-01 21:05:32 +00:00
Timothy Teakettle
806ad46aa6 no 2021-03-01 20:57:51 +00:00
Timothy Teakettle
329e8e7d38 Merge branch 'master' into language-tab 2021-03-01 20:49:16 +00:00
Lin
8919a8bb99 Merge pull request #14338 from Citadel-Station-13/silicons-patch-1
fixes florarevolution runtime when hitting hydrotrays
2021-03-01 14:15:31 -06:00
Letter N
09ce499146 aeiou 2021-03-01 21:55:34 +08:00
silicons
25a9f80c36 Merge pull request #14334 from SandPoot/this-proc-can't-be-split
Cannot modify null.real_name
2021-02-28 22:49:30 -07:00
silicons
638b6d05ac Merge pull request #14333 from Detective-Google/hamburger
departmental-ish turtlenecks
2021-02-28 22:49:09 -07:00
qweq12yt
2bfe99c2be fixes kinetic accelerator reload() proc 2021-02-28 23:27:52 -03:00
MarinaGryphon
cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06:00
silicons
0f16178425 changes 2021-02-28 02:43:32 -07:00
silicons
e36f148014 Merge pull request #14293 from SmArtKar/tcg_gaming
[READY] TCG fixes
2021-02-28 01:26:56 -07:00
silicons
2bcf05ee22 Update hydroponics.dm 2021-02-28 01:23:37 -07:00
silicons
0f35f01a9b changes 2021-02-28 00:58:13 -07:00
silicons
5d37871cd2 changes 2021-02-28 00:47:24 -07:00
silicons
519c694252 removes combat mode effects 2021-02-28 00:44:56 -07:00
silicons
8fc1dc9c29 changes 2021-02-28 00:40:04 -07:00
silicons
e43838739d changes 2021-02-28 00:37:39 -07:00
silicons
70c828f74d changes 2021-02-28 00:27:14 -07:00
silicons
e483ce8dfc changes 2021-02-28 00:05:32 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00
Hatterhat
1fc94c0441 uuuuuuuuuuuuh 2021-02-27 23:17:09 -06:00
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
Lin
ec2ca7985d Merge pull request #14311 from SandPoot/body-rejuv-buff
Body rejuvenation automatically repeats until completely healed
2021-02-27 17:13:16 -06:00
qweq12yt
d89bc85ae7 oops forgot a "/"
it could happen to anyone
2021-02-27 19:26:29 -03:00
qweq12yt
6d5afe146c restores any removed quirks when unchanging 2021-02-27 19:17:12 -03:00
Lin
41f227bc5e Merge pull request #14321 from Putnam3145/windbreaker-fix
Makes polychromic windbreaker's message not be nonsense
2021-02-27 14:43:35 -06:00
Lin
4cd12649d2 Merge pull request #14325 from dzahlus/slime-fix
Fixes toxin healing for slimes in heretic related stuff
2021-02-27 14:41:33 -06:00
SandPoot
b3c2f52358 Update transform_procs.dm 2021-02-27 15:57:04 -03:00
qweq12yt
d8d2a5d4c4 using quirk susbsysten instead of trats 2021-02-27 15:56:44 -03:00
SandPoot
0952777c56 upload transform_procs.dm 2021-02-27 15:53:17 -03:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00