Commit Graph

27555 Commits

Author SHA1 Message Date
Shadow Quill
89fdeb65c5 Adds small walk hud icons 2021-03-23 01:38:45 -05:00
Lin
dd764ceb0e Merge pull request #14491 from Hatterhat/triggerfix
noguns now takes precedence over trigger guard
2021-03-22 19:55:12 -05: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
fbe4e1d4e4 Merge pull request #14488 from Citadel-Station-13/silicons-patch-11
fixes TCG binder loading causing every latejoin to runtime out of EquipRank
2021-03-22 19:51:10 -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
Hatterhat
722b50088a message tweak
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-03-21 19:26:34 -05:00
Hatterhat
a8e4466476 sigh 2021-03-21 18:16:22 -05:00
LetterN
86b8bbf727 no more free shipping 2021-03-21 21:44:04 +08:00
silicons
4e22ad7484 Update job.dm 2021-03-21 02:07:03 -07:00
silicons
661ed14c83 Update job.dm 2021-03-21 02:05:43 -07:00
LetterN
8d9c4f55d6 no dumb names 2021-03-21 13:51:08 +08:00
LetterN
ce3c4e99ea fix-but-its-in-the-wrong-branch 2021-03-21 13:46:18 +08:00
silicons
720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more
Hierophant staff no longer deals 30 damage
2021-03-20 14:32:14 -06:00
silicons
295255e46e Merge pull request #14405 from Arturlang/vampire_death
Makes vampries dust when they can't pay the blood cost, not before
2021-03-20 14:31:14 -06:00
silicons
af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo
fixes puddles breaking
2021-03-20 14:30:10 -06:00
silicons
74e26f7a0c Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance
Buffed supermatter surge to make it up to 50x as strong as before.
2021-03-20 14:29:40 -06:00
silicons
e433aaf881 Merge pull request #14464 from GrayRachnid/filter
Enables the in character filter for server configuration
2021-03-20 14:28:40 -06: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
1b622af5e7 Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive
Fixes post absorb revive
2021-03-20 01:30:37 -06: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
Lin
9e06bafcfb Merge pull request #14470 from Citadel-Station-13/silicons-patch-8
no more bluespace bodybag of shotgun shells in pocket
2021-03-19 21:08:34 -05:00
Lin
51b955d47e Merge pull request #14460 from Hatterhat/exp-sup-con
moves the express supply console and upgrade disk to appropriate tabs
2021-03-19 19:18:19 -05:00
LetterN
150f6f4328 cbt 2021-03-19 20:11:26 +08: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
Timothy Teakettle
71d5528959 fix 2021-03-18 21:50:03 +00: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
f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -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
bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket
shameless buff to sec jacket
2021-03-18 06:39:24 -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
Ludox
828cfaf58a Cellular Emporium is gone 🦀
Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb)
2021-03-18 04:32:33 +01:00
GrayRachnid
5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
Ludox
fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01:00
Lin
f3fb22a2ab Merge pull request #14448 from Arturlang/give_fixes
Literally just adds targets to give because i forgot to do that
2021-03-17 16:32:11 -05:00
Hatterhat
dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
Hatterhat
5fa06109ac lemme get uh 2021-03-17 15:49:57 -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
Hatterhat
97e0e01265 ok 2021-03-17 03:25:06 -05: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
SandPoot
6bf711d7ec Update syndicate.dm 2021-03-16 22:54:59 -03:00
Lin
40fb1f2a0b Merge pull request #14445 from Citadel-Station-13/silicons-patch-7
ghost swords now properly set force instead of just working on mobs
2021-03-16 20:48:10 -05:00
DeltaFire
b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
kiwedespars
158008b80f maybe too big a buff 2021-03-16 11:05:49 -07:00