Commit Graph

9625 Commits

Author SHA1 Message Date
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
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
Sneakyrat6
d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
silicons
9110ebcac1 Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff
Allows repeated mode adjust to be >100 total
2021-03-09 00:20:29 -07: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
necromanceranne
27a128fe53 Allows the augment manipulator to paint limbs like roundstart prosthetics. 2021-03-09 03:25:57 +11:00
Putnam
5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08:00
Putnam
a651b629c9 Allows repeated mode adjust to be >100 total 2021-03-07 19:28:50 -08:00
Sneakyrat6
703567e591 other fixes 2021-03-07 04:09:36 -05:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons
c6ba7bfe1f changes 2021-03-06 18:06:53 -07: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
2de08b7bae lateinit mayhaps? 2021-03-06 20:01:14 +08: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
a43309a097 shuttle pog 2021-03-05 22:26:55 +08: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
dcab40cdb6 building pipeline 2021-03-04 21:51:20 +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
Putnam
2137818d76 Massively reduced max-size minesweeper 2021-03-03 18:42:35 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07: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
silicons
824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix
[FIX] More pacifism bug squashing
2021-03-02 16:57:26 -07:00
timothyteakettle
f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle
a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00: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
silicons
6f91da89d7 Merge pull request #14322 from Putnam3145/pai-policy
Adds a pAI policy config
2021-03-01 18:26:57 -07:00
dzahlus
f0a34723d7 tase lase 2021-03-01 23:58:29 +01:00
qweq12yt
d3aeb714f1 flamethrowers now can't be used by pacifists 2021-02-28 20:21:19 -03:00
silicons
0f16178425 changes 2021-02-28 02:43:32 -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
8e249eed4f changes 2021-02-28 00:33:10 -07:00
silicons
70c828f74d changes 2021-02-28 00:27:14 -07:00
silicons
70b8d833c0 changes 2021-02-28 00:00:14 -07:00