silicons
|
3292e3a725
|
Merge pull request #14393 from Auris456852/master
Corrects Hexacamphor
|
2021-03-10 14:02:35 -07: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 |
|
Putnam
|
40dfd40bcd
|
Made it not weight almost entirely based on chaos.
|
2021-03-10 00:04:35 -08:00 |
|
silicons
|
0db0612e56
|
Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic
Removes one paramedic slot
|
2021-03-09 23:26:53 -07:00 |
|
Lin
|
1216a6edc5
|
Merge pull request #14381 from LetterN/patch-5
fixes drone inventory deleting stuff
|
2021-03-09 22:45:02 -06: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 |
|
silicons
|
41b75c8eb9
|
Merge pull request #14379 from necromanceranne/too_many_limbs
Fixes being able to go over the defined limit of roundstart prosthetics
|
2021-03-09 21:39:41 -07:00 |
|
Auris456852
|
8334e8c2c0
|
Corrects Hexacamphor
|
2021-03-10 00:35:00 +02:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
silicons
|
3693eb1f16
|
Merge pull request #14374 from SandPoot/don't-litter-please
Makes it so you don't drop cans upon crushing them
|
2021-03-09 00:20:43 -07: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 |
|
silicons
|
34c4887b69
|
Merge pull request #14351 from Putnam3145/teg-uncap
Uncaps TEG output
|
2021-03-09 00:17:47 -07:00 |
|
Suicidalpickles
|
6496b418d4
|
Update paramedic.dm
|
2021-03-08 18:31:34 -08:00 |
|
Letter N
|
3fa43b7f61
|
oops forgot this reg
|
2021-03-09 10:09:02 +08:00 |
|
necromanceranne
|
bdcd2904e6
|
Fixes going over the defined limit of roundstart prosthetics
|
2021-03-09 03:56:51 +11:00 |
|
necromanceranne
|
27a128fe53
|
Allows the augment manipulator to paint limbs like roundstart prosthetics.
|
2021-03-09 03:25:57 +11:00 |
|
Letter N
|
de6f1401bb
|
final fix
|
2021-03-08 13:24:28 +08:00 |
|
Putnam
|
5f6d478509
|
Added a "desired mode chaos" system
|
2021-03-07 20:14:11 -08:00 |
|
Sneakyrat6
|
0db08088c4
|
Fixes material insertion animations not working when there is no silo
|
2021-03-07 22:43:55 -05:00 |
|
Putnam
|
a651b629c9
|
Allows repeated mode adjust to be >100 total
|
2021-03-07 19:28:50 -08:00 |
|
SandPoot
|
80cb870311
|
upload drinks.dm
|
2021-03-07 21:39:10 -03:00 |
|
Sneakyrat6
|
395bdaf5f9
|
removes code i commented out
|
2021-03-07 04:13:18 -05:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
Letter N
|
8c3c259850
|
pepegasort
|
2021-03-07 14:11:09 +08:00 |
|
Letter N
|
22b33d1a6e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-07 13:04:36 +08:00 |
|
silicons
|
87c7487344
|
Merge pull request #14361 from Putnam3145/hyper-nob-easier
Makes hyper-nob, nitryl easier to make
|
2021-03-06 17:00:24 -07:00 |
|
silicons
|
06f6a7eb46
|
Merge pull request #14360 from Hatterhat/pipegun
pipe shotgun reskins
|
2021-03-06 17:00:15 -07:00 |
|
silicons
|
4fdaf10049
|
Merge pull request #14359 from Hatterhat/traumannounce
funny trauma announce
|
2021-03-06 17:00:10 -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
|
4482453067
|
dihydrogen
|
2021-03-06 19:56:19 +08:00 |
|
Letter N
|
4463fd9513
|
paperwork mini update, also ASS_BLAST_USA
|
2021-03-06 19:28:29 +08:00 |
|
Sneakyrat6
|
f875218284
|
Fixes material component
|
2021-03-06 03:48:52 -05:00 |
|
Letter N
|
709aaa5006
|
NEW() moment
|
2021-03-06 13:28:57 +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 |
|
DeltaFire
|
483790889c
|
Merge pull request #14312 from Citadel-Station-13/silicons-patch-20
makes codebase compile on 514 (wow one line)
|
2021-03-06 03:41:59 +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
|
4f8d6c7c11
|
bruh
|
2021-03-05 17:21:22 +08:00 |
|
Letter N
|
e967590dfa
|
fix verb
|
2021-03-05 17:17:30 +08:00 |
|
Letter N
|
edfe7220c4
|
lintfix
|
2021-03-05 15:45:57 +08:00 |
|
Letter N
|
2542fe05e9
|
mapmerge update + mats properly work
|
2021-03-05 15:38:35 +08:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|