Commit Graph

9404 Commits

Author SHA1 Message Date
Lin
ebf652f736 Merge pull request #14472 from silicons/sigh_615
makes the global antag disable pref more clear. forces savefile update to default all players to having the **disable** *disabled* (i love double negatives).
2021-03-23 17:53:50 -05:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
Lin
715f86ef5c Merge pull request #14447 from LetterN/fixes-2
Fixes laptop and tweaks stacks
2021-03-22 19:52:42 -05:00
Lin
4e641eedb9 Merge pull request #14489 from LetterN/amogus
Fixes NIRM
2021-03-22 15:37:56 -05:00
LetterN
760a7de229 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-22 09:32:21 +08:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
silicons
6491615775 Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
2021-03-20 14:28:33 -06:00
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
2021-03-20 14:28:07 -06:00
silicons
d9a2316825 fix 2021-03-20 12:13:28 -07:00
Lin
a9a5bdc61a Merge pull request #14471 from Citadel-Station-13/silicons-patch-9
fixes being able to reach into closed bodybags (couldn't webedit 2 files in one PR without being not lazy)
2021-03-19 21:08:39 -05:00
LetterN
150f6f4328 cbt 2021-03-19 20:11:26 +08:00
ItzGabby
ea1cf6797e I'm literally going to die with these checks 2021-03-19 02:59:30 -04:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
LetterN
2c2e779aa6 Merge remote-tracking branch 'origin/master' into fixes-2 2021-03-19 10:28:43 +08:00
silicons
1f58e1823e Update bodybag.dm 2021-03-18 17:00:16 -07:00
silicons
d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
silicons
8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
2021-03-18 06:41:38 -06:00
silicons
3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref
Added a "no antags please" pref
2021-03-18 06:39:48 -06:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
Hatterhat
dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
DeltaFire
45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
2021-03-17 17:01:47 +01:00
Putnam
f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
Putnam
d990328e29 Added a "no antags please" button 2021-03-16 22:37:39 -07:00
LetterN
69982f6315 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14452
and-might-have fi-x-ed https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14450
2021-03-17 11:49:50 +08:00
LetterN
228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
DeltaFire
2d43fd06e8 qdel 2021-03-15 23:14:29 +01:00
DeltaFire
f99c17012c removes jars from techweb 2021-03-15 22:26:05 +01:00
silicons
5472186bc2 Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
2021-03-14 23:30:26 -06:00
silicons
21ff66b1a5 Merge pull request #14397 from SandPoot/fixes-tcomms-for-AIs
Fixes general interactions with telecomms.
2021-03-14 00:20:57 -07:00
kiwedespars
69d927e756 Merge branch 'master' into void-but-for-real 2021-03-12 23:10:19 -08:00
kiwedespars
5ce42584b2 void tp effect, sound changes 2021-03-10 21:16:08 -08:00
Lin
521570793f Merge pull request #14392 from R3dtail/patch-4
Readability/Grammar alteration
2021-03-10 18:34:47 -06:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
silicons
7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos
Adds recent-chaos weighting for secret
2021-03-10 14:02:11 -07:00
silicons
939a493334 Merge pull request #14306 from Putnam3145/supernova
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
silicons
18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
silicons
03fbb256e4 Merge pull request #14371 from Sneakyrat6/matContainer
Material container fixes
2021-03-10 01:31:51 -07:00
Putnam
25b021a343 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into mode-chaos 2021-03-10 00:06:40 -08:00
Letter N
138cfd388f a 2021-03-10 14:40:25 +08:00
silicons
007ed3e851 Merge pull request #14378 from necromanceranne/cyberlimbies
The augment manipulator can make printed prosthetics look like the roundstart choosable limbs
2021-03-09 21:41:24 -07:00
SandPoot
221c059435 there's gonna be so many commit logs. hopefully this is the last. 2021-03-10 01:34:25 -03:00
Letter N
41461b3a5f bruh alert 2021-03-10 12:32:53 +08:00
Letter N
068a6e093f YOU MOTHERFUCKER 2021-03-10 12:26:54 +08:00
SandPoot
024d0ec692 admins should be able to see, and anyone else shouldn't break it, and i probably need sleep 2021-03-10 01:18:31 -03:00
Letter N
04f87e42f8 fixes https://github.com/Citadel-Station-13/Citadel-Station-13/issues/14399 2021-03-10 12:06:15 +08:00
SandPoot
3b0ebc0b80 cyborgs were messed up too 2021-03-10 01:03:31 -03:00
SandPoot
7b35a33d58 upload machine_interactions.dm 2021-03-10 00:33:11 -03:00
Letter N
59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00