Commit Graph

27407 Commits

Author SHA1 Message Date
Putnam
c30fdfe5fc Nerfs hyper-nob's point values 2021-03-14 20:14:32 -07:00
Putnam
9a3e1d0307 wow that's REALLY REALLY BAD 2021-03-14 19:02:44 -07:00
Putnam
c9923f7e47 Tweaks supernova to not be inconsequential as often 2021-03-14 15:31:05 -07: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
silicons
5a9fc99aba Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
2021-03-12 19:40:02 -07:00
silicons
9d48fba839 Merge pull request #14410 from Adelphon/hair
new hair/sprite fix
2021-03-12 19:35:47 -07:00
Lin
907ac9fc8a Merge pull request #14423 from Putnam3145/mode-chaos
makes the chaos thing actually work (whoops)
2021-03-12 18:21:40 -06:00
Putnam
49e1673047 how did i mess up a copypasta like this 2021-03-12 15:44:15 -08:00
Putnam
4fb560ea98 makes the chaos thing actually work (whoops) 2021-03-12 14:46:58 -08:00
Lin
9a16375e0b Merge pull request #14403 from Hatterhat/brped-desc
fixes the BRPED desc that has been quirky! for years
2021-03-12 14:30:02 -06:00
Hatterhat
48de811919 fucking finally holy shit 2021-03-11 19:10:23 -06:00
silicons
753d79be69 Update boss.dm 2021-03-11 05:54:36 -07:00
Lin
521570793f Merge pull request #14392 from R3dtail/patch-4
Readability/Grammar alteration
2021-03-10 18:34:47 -06:00
Adelphon
56cccc2ca3 new hair 2021-03-10 18:14:07 -05:00
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
Hatterhat
6a7d4e32d7 i'm gonna fight blackmajor over this 2021-03-10 13:55:00 -06: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
SandPoot
221c059435 there's gonna be so many commit logs. hopefully this is the last. 2021-03-10 01:34:25 -03: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
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
Auris456852
8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
R3dtail
25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06: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