Commit Graph

34962 Commits

Author SHA1 Message Date
Ghommie cdebccf38f downgrading for now till I port cyberboss linux tgs4 docker hack and the end of BSQL.
Gosh please work, I'm dead tired.
2020-07-03 08:41:42 +02:00
Ghommie e3b470f5d3 Alright, I don't want to deal with path shenanigans right now. 2020-07-03 08:15:29 +02:00
Ghommie 3de6602559 install_rust_g update from tg. 2020-07-03 07:44:40 +02:00
Ghommie 8b180e3131 File permissions? 2020-07-03 07:21:03 +02:00
Ghommie 0c206ed3fa Updating rust-g dependencies to 0.4.5 2020-07-03 06:17:14 +02:00
CitadelStationBot 54b4672f13 Automatic changelog generation for PR #12668 [ci skip] 2020-07-02 17:41:07 -05:00
Ghom 50716ee393 Merge pull request #12668 from Arturlang/strip_menu_helmet
Hardsuit strip menu helmet toggle
2020-07-03 00:41:03 +02:00
CitadelStationBot 07c323f1da Automatic changelog generation for PR #12665 [ci skip] 2020-07-02 17:33:14 -05:00
Ghom f8c7a27056 Merge pull request #12665 from Detective-Google/sexywalls
retextures titanium walls (tg#50454)
2020-07-03 00:33:10 +02:00
CitadelStationBot 26c1e89e35 Automatic changelog generation for PR #12671 [ci skip] 2020-07-02 17:26:30 -05:00
Ghom 7370b7c687 Merge pull request #12671 from Sonic121x/patch-2
Fix Pilltype button (for real this time).also fix technode icon missing.
2020-07-03 00:26:28 +02:00
CitadelStationBot b08a1d9966 Automatic changelog generation for PR #12674 [ci skip] 2020-07-02 17:13:47 -05:00
silicons 29221d91d9 Merge pull request #12674 from Citadel-Station-13/Ghommie-patch-1
Actually fixing a feature.
2020-07-02 15:13:43 -07:00
Ghom e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
Ghom c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00
Ghom 4354b0bf6f Actually fixing a dum dum feature. 2020-07-02 19:26:52 +02:00
Sonic121x 4e2b05a22a Fix the missing Technode icon 2020-07-02 22:33:35 +08:00
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
Artur 582d672109 Hardsuit strip menu helmet toggle 2020-07-02 01:31:15 +03:00
Timothy Teakettle 84d60a455e wow its still spelt wrong 2020-07-01 21:53:34 +01:00
Detective Google 6f67be1aca sexy walls :crabrave: 2020-07-01 15:43:23 -05: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