Commit Graph

34943 Commits

Author SHA1 Message Date
Sonic121x
ea7fed0c8e givme that pilltype button
Fix pill type button
2020-07-02 22:30:28 +08:00
CitadelStationBot
382bcfa777 Automatic changelog generation for PR #12666 [ci skip] 2020-07-02 07:52:42 -05:00
Ghom
ef60068f1c Merge pull request #12666 from timothyteakettle/more-blood-fixes
More blood fixes
2020-07-02 14:52:39 +02:00
Putnam3145
fc306b5c1b Merge pull request #12670 from Citadel-Station-13/silicons-patch-14
PLEASE SANITIZE PREFERENCES PLEASE ALWAYS SANITIZE PREFERENCES NEVER DONT SANITIZE PREFERENCES EVERYONE HAS A NULL SPEECH VERB
2020-07-02 03:51:07 -07:00
silicons
5f11612078 Update preferences_savefile.dm 2020-07-02 03:00:35 -07:00
silicons
bb67ab5ddd Merge pull request #12664 from Ghommie/Ghommie-cit827
Porting a few asset cache related PRs.
2020-07-02 01:49:27 -07:00
CitadelStationBot
0581015c8d Automatic changelog generation for PR #12657 [ci skip] 2020-07-02 03:48:22 -05:00
silicons
9ae040b904 Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
2020-07-02 01:48:19 -07:00
CitadelStationBot
779c404615 Automatic changelog generation for PR #12661 [ci skip] 2020-07-02 03:46:18 -05:00
silicons
7b99e69583 Merge pull request #12661 from LetterN/cool-fucked-up-another-master-branch-fixes-assetthing
Fix broken UI icons
2020-07-02 01:46:14 -07:00
CitadelStationBot
9e97b8187c Automatic changelog generation for PR #12630 [ci skip] 2020-07-02 03:45:03 -05:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
CitadelStationBot
8e96d25787 Automatic changelog generation for PR #12632 [ci skip] 2020-07-02 03:44:13 -05:00
silicons
cbad654371 Merge pull request #12632 from Ghommie/Ghommie-cit823
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
2020-07-02 01:44:09 -07:00
CitadelStationBot
659ff98ad3 Automatic changelog generation for PR #12631 [ci skip] 2020-07-02 03:43:56 -05:00
silicons
9abeb9c07e Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1
Nerfing shaft miners' paycheck.
2020-07-02 01:43:53 -07:00
Changelogs
b823bbce5c Automatic changelog compile [ci skip] 2020-07-02 00:09:31 +00:00
CitadelStationBot
565a4a49e4 Automatic changelog generation for PR #12407 [ci skip] 2020-07-01 18:11:10 -05:00
silicons
27f7224d4d Merge pull request #12407 from Trilbyspaceclone/lavaland-ruin-tweaks
Much better looking lava land ruins!
2020-07-01 16:11:06 -07:00
Timothy Teakettle
84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6 oh my god its not even defined right 2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562 fix bloodpacks 2020-07-01 21:00:01 +01:00
CitadelStationBot
6fdf713491 Automatic changelog generation for PR #12656 [ci skip] 2020-07-01 14:30:20 -05:00
Lin
fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
2020-07-01 14:30:16 -05:00
Ghom
8666f83848 Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
2020-07-01 19:52:44 +02:00
Ghom
aaffe3ec12 Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
2020-07-01 19:46:16 +02:00
Ghom
d8d9038b24 Merge pull request #12659 from silicons/ok
removes sexchem jumpsuit ripping
2020-07-01 19:39:04 +02:00
Ghommie
f7de8034a1 Put an end to the null stack traces from icon2html's register_asset. 2020-07-01 19:26:09 +02:00
Ghommie
94f7dae62e Porting "Fix asset cache verification" and other tiny bits. 2020-07-01 16:24:12 +02:00
CitadelStationBot
6b3254ef39 Automatic changelog generation for PR #12654 [ci skip] 2020-07-01 08:17:52 -05:00
Ghom
f5debba324 Merge pull request #12654 from Citadel-Station-13/silicons-patch-13
readds bohbombing
2020-07-01 15:17:47 +02:00
Ghom
8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
Letter N
b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
silicons
8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-30 20:27:30 -07:00
silicons
434a53340b groan 2020-06-30 20:21:59 -07:00
bunny232
afe9b2dfbd Update holy_weapons.dm 2020-06-30 11:15:40 -04:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
silicons
837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
Changelogs
28fd6304e2 Automatic changelog compile [ci skip] 2020-06-30 00:08:43 +00:00
CitadelStationBot
005e548288 Automatic changelog generation for PR #12288 [ci skip] 2020-06-29 19:05:08 -05:00
Putnam3145
062768c273 Merge pull request #12288 from Ghommie/Ghommie-cit765
Porting the twohanded component.
2020-06-29 17:05:04 -07:00
zerothebigboy
40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghom
3c4a288ecc Merge pull request #12625 from Citadel-Station-13/silicons-patch-9
maybe fixes edge cases where half the server has their client input system broken
2020-06-30 00:21:42 +02:00
CitadelStationBot
491b225631 Automatic changelog generation for PR #12629 [ci skip] 2020-06-29 16:51:02 -05:00
silicons
771714cc78 Merge pull request #12629 from kappa-sama/patch-28
https://github.com/tgstation/tgstation/pull/51886 by Fikou
2020-06-29 14:50:59 -07:00
CitadelStationBot
9f35c8475f Automatic changelog generation for PR #12598 [ci skip] 2020-06-29 16:47:28 -05:00
silicons
52953cae4d Merge pull request #12598 from timothyteakettle/improves-char-customization
speech options on char customization, small skeleton changes
2020-06-29 14:47:25 -07:00
Timothy Teakettle
a7c905dfe9 handles skeletons better 2020-06-29 22:37:04 +01:00
silicons
bfbe472114 Merge pull request #12587 from Ragolution/peachesnz
Peachening 2 Even with Master Boogaloo
2020-06-29 14:22:32 -07:00