Commit Graph

19663 Commits

Author SHA1 Message Date
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
zeroisthebiggay
24e0b7dc22 revert the nerf maybe 2021-03-01 15:31:19 -05: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
zerothebigboy
165966ffeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	icons/mob/clothing/suit.dmi
2021-02-28 22:13:00 -05: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
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
R3dtail
af4b8ef0c5 Update vorepanel.dm
Made it uniform with the maximum characters allowed for emotes because uniformity is nice.
2021-02-26 19:36:44 -06:00
Letter N
c208f82abf oops! all dumb cat 2021-02-27 09:15:39 +08:00
Letter N
59990abd25 grr 2021-02-27 08:41:54 +08:00
R3dtail
ccdfbbdc04 I'm really stupid.
// not \\
2021-02-26 15:33:37 -06:00
R3dtail
791ddd03d9 Tweaks anamolous crystal to prevent clown-griefing 2021-02-26 15:24:07 -06:00
R3dtail
9ea578987f Bigger Belly
Doubles the number of characters available to be used for bellies_desc_max.  Additionally, doubles the number of characters available for the bellies_name_max.
2021-02-26 15:03:32 -06:00
Lin
969487c44e Merge pull request #14316 from Putnam3145/tablet-rad-fix
Makes tablets not permacontam.
2021-02-26 14:41:43 -06:00
silicons
318f9f5a3d Merge pull request #14289 from TheObserver-sys/BotanyPassII
Botany Pass II: How the hell did it take me this long to notice that these things aren't functioning????
2021-02-26 13:38:56 -07:00
silicons
6c3be09e97 Merge pull request #14300 from keronshb/sentientbuff
Allows Sentient Disease to purchase most abilities from the start.
2021-02-26 13:36:27 -07:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
2021-02-26 13:36:09 -07:00
silicons
0939e31982 Merge pull request #14283 from Hatterhat/patch-1
buhhh lingfist nerf 3am webedit
2021-02-26 13:36:01 -07:00
silicons
bf38aa73ff Merge pull request #14285 from kappa-sama/patch-46
makes tcg cards and binders small and thus easier to store for persistence
2021-02-26 13:35:02 -07:00
dzahlus
51595705e4 simpin for slimes 2021-02-26 20:59:28 +01:00
dzahlus
12c7e22c28 ugh lavaland 2021-02-26 15:57:27 +01:00