shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

28420 Commits

Author SHA1 Message Date
silicons 7e3d72eddb Merge pull request #14376 from Putnam3145/mode-chaos 
Adds recent-chaos weighting for secret
 2021-03-10 14:02:11 -07:00
Artur d646b7535c Makes vampries dust when they can't pay the blood cost, not before 2021-03-10 22:31:53 +02: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
Letter N 138cfd388f a 2021-03-10 14:40:25 +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
Letter N 41461b3a5f bruh alert 2021-03-10 12:32:53 +08:00
Letter N 068a6e093f YOU MOTHERFUCKER 2021-03-10 12:26:54 +08: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
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
Auris456852 8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
kiwedespars 01b026f889 trailing newlines 2021-03-09 12:53:53 -08:00
kiwedespars b868f5fc32 whoops forgot sac targets list 2021-03-09 12:49:02 -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 0d696de7cd exist 
- fixes things.
- user check readded (whoops)
- knwoledge added
- nerfs madness mask
 2021-03-09 12:12:44 -08:00
silicons 57f1144b8c Update _movespeed_modifier.dm 2021-03-09 05:29:46 -07: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 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
silicons 771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Suicidalpickles 6496b418d4 Update paramedic.dm 2021-03-08 18:31:34 -08:00
silicons 596d0687d9 Update necropolis_gate.dm 2021-03-08 19:16:23 -07: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
Dan-Neposh e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05: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
Heretical Lizard 60b4aa58cd Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:19 -05:00
Heretical Lizard 55e337a9a4 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:06 -05:00