Commit Graph
1796 Commits
Author SHA1 Message Date
LinandGitHub f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000 f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000andGitHub d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller
More dynamic tweaks
2020-04-25 17:05:38 -07:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
kevinz000andGitHub 3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
2020-04-17 05:43:49 -07:00
necromanceranne d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts 2020-04-15 19:00:01 +10:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Artur fb7dc7a54c Fucking icons 2020-04-14 09:42:11 +03:00
Artur 356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
kevinz000andGitHub 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
kevinz000andGitHub d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
GhomandGitHub f5852424e3 Merge pull request #11812 from Auris456852/master
Adds admin printer noise for Centcomm/Syndicate messages
2020-04-12 06:25:52 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Auris456852 03f583e5ff Adds admin printer noise for Centcomm/Syndicate messages 2020-04-10 18:50:52 +03:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
kevinz000andGitHub 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms
Makes upgrading telecoms more usefull
2020-04-09 02:38:10 -07:00
kevinz000andGitHub 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
TrilbySpaceClone bfa83591df what if we made upgrading them more usfull 2020-04-06 07:35:36 -04:00
necromanceranne 33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10:00
GhomandGitHub e2d2f5a4ad Update minesweeper.dm 2020-04-04 14:04:47 +02:00
GhomandGitHub 3c9a9136b5 Update minesweeper.dm 2020-04-04 13:46:21 +02:00
kevinz000andGitHub 010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
necromanceranne 0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Ghommie 73c52c0c6e Accurate minefield. 2020-04-01 05:19:29 +02:00
Ghommie 04c8cb09a4 out of bounds coordinates sanity 2020-04-01 04:41:21 +02:00
Ghommie 736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02:00
kevinz000andGitHub b3642a3470 Merge pull request #11681 from PersianXerxes/medicalTGUINext
TGUI Next in the Medbay
2020-03-31 18:02:11 -07:00
Artur a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
kevinz000andGitHub 2521aa4973 Merge pull request #11677 from actioninja/wooow-glow
Better glowing lights
2020-03-30 14:50:36 -07:00
6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691)
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-30 23:24:51 +02:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
KathrinBailey b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
Persi 304b2c68bf Finished, after a way too long break! 2020-03-29 09:36:40 -04:00
Persi 0bc6a3d4b6 Updating
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
2020-03-29 08:35:15 -04:00
actioninja abde27c098 layer changes 2020-03-28 23:50:08 -07:00
kevinz000andGitHub 6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Seris02 17f4b0f34f I assume this works 2020-03-26 17:46:41 +08:00
KathrinBailey 134d861fd7 KAT SHUTTERS ALL OF THE STUFF
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
2020-03-24 20:13:48 +00:00
Artur 9bb7529a49 Progress 2020-03-24 16:55:46 +02:00