shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,675 Commits 5 Branches 0 Tags
a415453540887b5757b72bb7c3a2db874b6c6dcb
Commit Graph

27896 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
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
Heretical Lizard 63d21d151c Update code/modules/mob/living/living_defense.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:13:03 -05:00
Heretical Lizard 263c7a9854 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:06:57 -05:00
Heretical Lizard 9787c02258 Update code/modules/mob/living/living_defense.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:06:18 -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 5d1cda26dc changes 2021-03-06 18:15:37 -07:00
silicons cf7d428ac6 changes 2021-03-06 18:11:40 -07:00
silicons c6ba7bfe1f changes 2021-03-06 18:06:53 -07: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