1338 Commits
Author SHA1 Message Date
Ghommie 42d7d57ad6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698 2020-05-02 19:17:48 +02:00
Putnam3145andGitHub c1d1e4f0c0 Properly closes some bold tags. (#12088)
* Fixes some unmatched <b>s

* remember to ctrl+s
2020-05-02 14:53:17 +02:00
Ghommie 202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
kevinz000andGitHub d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
kevinz000andGitHub 7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707
VR Levels are not a subset of Away Missions anymore.
2020-04-25 16:51:52 -07:00
kevinz000andGitHub 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Ghommie 58fc679cce WIP 2020-04-24 20:49:15 +02:00
Ghommie de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Artur f97f264fb7 Fixing more stuff
Mint machine compile fixes and the syndicate contractor program.
2020-04-23 20:09:42 +03:00
Artur 120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur 9d870893fb Beginning work on DNA console TGUI, plus some camera console fixes 2020-04-23 13:24:43 +03:00
Artur 803efebf65 https://github.com/tgstation/tgstation/pull/49960 Port 2020-04-23 12:45:50 +03:00
Artur 67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie 63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghommie e9bf432a0d Scavenging element. 2020-04-22 03:30:40 +02:00
Putnam3145andGitHub 45f032a600 Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
2020-04-21 13:04:31 -07:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
kevinz000andGitHub ab01d91971 Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
2020-04-18 19:32:50 -07:00
Ghommie 523672b6a5 fix for my relatively minuscule backend refactor for holodeck. 2020-04-18 02:32:10 +02:00
GhomandGitHub 7a47debe9e Merge branch 'master' into Ghommie-patch-1 2020-04-18 01:27:00 +02:00
Ghommie 87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie 3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
kevinz000andGitHub 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
GhomandGitHub e0248d6b97 Update sanitize_values.dm 2020-04-16 15:53:15 +02:00
Linzolle 39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie c774f18758 . 2020-04-14 19:18:08 +02:00
Ghommie 571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
GhomandGitHub 55402b1834 Merge branch 'master' into Ghommie-cit679 2020-04-14 16:22:00 +02:00
GhomandGitHub a57828703e Update mobs.dm 2020-04-14 16:09:31 +02:00
GhomandGitHub 5d01e05991 Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
2020-04-14 12:38:34 +02:00
kevinz000andGitHub 7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
2020-04-14 01:35:46 -07: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
Ghommie e753c1ad14 Fixed a little peeve with random bodies. 2020-04-14 02:20:19 +02:00
Ghommie db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie 0816512150 more work. 2020-04-13 16:09:52 +02:00
kevinz000andGitHub e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674
Little Holodeck refactor.
2020-04-12 17:03:11 -07: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
Ghommie 05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
LinandGitHub 4e1079bc9a Merge pull request #11786 from Citadel-Station-13/Ghommie-patch-1
I did a oopsie and made containment bags also stop radiation internal to a contained object.
2020-04-12 16:20:08 +00:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
Ghommie 983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
kevinz000 65f61c968c k 2020-04-11 05:16:42 -07:00
kevinz000 76e93d504a this massive proc lmao 2020-04-11 05:15:50 -07:00
kevinz000 8a8cfbe54a fixes 2020-04-11 05:13:17 -07:00