Commit Graph

5846 Commits

Author SHA1 Message Date
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
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 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
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
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 18fdd0c6cf Merge pull request #14337 from kiwedespars/we-hate-cqc
nerfs cqc (probably)
2021-03-10 01:32:14 -07:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
R3dtail 25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06:00
kiwedespars 3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
silicons 58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
2021-03-09 00:18:41 -07:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons 21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
2021-03-06 16:59:46 -07:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
DeltaFire 357853863e Merge pull request #14352 from timothyteakettle/jar-nerf
exiting a bluespace jar through any means, hardstuns you for 5 seconds
2021-03-06 03:50:35 +01:00
Letter N c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Putnam3145 43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak
Removes Superconuctivity from Reinforced Plasma Glass
2021-03-04 09:33:45 -08:00
Letter N 45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N 7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Hatterhat 9b2d62b9ef whoops again 2021-03-02 22:09:38 -06:00
Hatterhat dc5ca7a556 oops 2021-03-02 22:07:13 -06:00
Hatterhat 053f9ea857 any% 2021-03-02 22:06:57 -06:00
keronshb b105556603 No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
2021-03-02 21:45:36 -05:00