Commit Graph
33102 Commits
Author SHA1 Message Date
CitadelStationBot 9d139bf584 Automatic changelog generation for PR #11820 [ci skip] 2020-04-17 15:45:44 -05:00
LinandGitHub 7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
2020-04-17 20:45:40 +00:00
kevinz000andGitHub 1608bd2548 Update shields.dm 2020-04-17 11:57:18 -07:00
Putnam3145andGitHub 6e8f58d945 Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3
Once upon a time, a based guardian anchored its name to others' minds.
2020-04-17 09:36:53 -07:00
CitadelStationBot 181f147f20 Automatic changelog generation for PR #11863 [ci skip] 2020-04-17 07:51:50 -05:00
kevinz000andGitHub 5b86c334f9 Merge pull request #11863 from Trilbyspaceclone/patch-342
Honey Palm can be distill into mead
2020-04-17 05:51:47 -07:00
CitadelStationBot d073717113 Automatic changelog generation for PR #11774 [ci skip] 2020-04-17 07:51:29 -05:00
kevinz000andGitHub 7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
More mapping Loot tables and code improvements + Maints/Locker loot changes
2020-04-17 05:51:26 -07:00
kevinz000andGitHub 09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-17 05:49:09 -07:00
CitadelStationBot 00f549bb0d Automatic changelog generation for PR #11869 [ci skip] 2020-04-17 07:43:52 -05: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
CitadelStationBot 0be6467267 Automatic changelog generation for PR #11870 [ci skip] 2020-04-17 07:42:20 -05:00
kevinz000andGitHub 6a92c47d31 Merge pull request #11870 from Trilbyspaceclone/patch-343
Catnip is no longer a mime plant
2020-04-17 05:42:17 -07:00
kevinz000andGitHub 4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683
Fixing some dog tier issue.
2020-04-17 05:40:50 -07:00
kevinz000andGitHub 359790f5af Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2
Made light bulb/tubes actually use vis_overlays instead of overlays.
2020-04-17 05:40:32 -07:00
CitadelStationBot 92c8ccaa8a Automatic changelog generation for PR #11880 [ci skip] 2020-04-17 07:39:57 -05:00
kevinz000andGitHub d1d3c1f773 Merge pull request #11880 from NopemanMcHalt/benohybrid-screem
Allows xenohybrids to scream like xeno would
2020-04-17 05:39:54 -07:00
CitadelStationBot 68f14b3a57 Automatic changelog generation for PR #11857 [ci skip] 2020-04-17 07:20:56 -05:00
kevinz000andGitHub e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
2020-04-17 05:20:53 -07:00
CitadelStationBot 57fb1c1a17 Automatic changelog generation for PR #11852 [ci skip] 2020-04-17 07:16:08 -05:00
kevinz000andGitHub 61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
2020-04-17 05:16:04 -07:00
CitadelStationBot 6abece11cd Automatic changelog generation for PR #11849 [ci skip] 2020-04-17 07:09:40 -05:00
kevinz000andGitHub 038cb5c911 Merge pull request #11849 from Ghommie/Ghommie-cit680
Removes pixel offsets from box dorms lockers/dressers etcetera.
2020-04-17 05:09:37 -07:00
CitadelStationBot 18388fee12 Automatic changelog generation for PR #11877 [ci skip] 2020-04-17 01:55:17 -05:00
GhomandGitHub 044d360d20 Merge pull request #11877 from Detective-Google/lambda-fixes
Fixes a bunch of gripes people had with lambda.
2020-04-17 08:55:14 +02:00
CitadelStationBot 5ff909db1f Automatic changelog generation for PR #11886 [ci skip] 2020-04-17 01:53:23 -05:00
GhomandGitHub d2a811a8d8 Merge pull request #11886 from jjpark-kb/youtoolfix
[Fix] YouTool Vending
2020-04-17 08:53:20 +02:00
GhomandGitHub 0fb1286042 Update guardian.dm 2020-04-17 08:47:05 +02:00
jjpark-kb 4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
Detective Google 78527739e3 moves a tiny fan away from the very angry ball of lightning 2020-04-16 17:21:25 -05:00
TrilbyspacecloneandGitHub 6f4a3fc179 wine to jello 2020-04-16 17:51:03 -04:00
Detective Google 16b02495ae fixes the exe- valid room not being wired to the grid 2020-04-16 16:21:43 -05:00
CitadelStationBot 19328b8710 Automatic changelog generation for PR #11844 [ci skip] 2020-04-16 12:08:13 -05:00
GhomandGitHub e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
2020-04-16 19:08:09 +02:00
CitadelStationBot 6c55480787 Automatic changelog generation for PR #11734 [ci skip] 2020-04-16 12:06:52 -05:00
GhomandGitHub 10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329
Six new Sci based bounties!
2020-04-16 19:06:48 +02:00
GhomandGitHub 19f79f8843 Merge pull request #11611 from monster860/patch-2
Makes so turning in place updates riders when riding someone's back
2020-04-16 19:06:10 +02:00
GhomandGitHub eb48e00bcb Merge pull request #11805 from kevinz000/damage_procs_lite
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
2020-04-16 19:05:34 +02:00
CitadelStationBot 30617f62f1 Automatic changelog generation for PR #11839 [ci skip] 2020-04-16 12:04:19 -05:00
GhomandGitHub bceca18626 Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
2020-04-16 19:04:16 +02:00
Ghommie 2200c690f7 configs 2020-04-16 18:44:05 +02:00
Putnam3145andGitHub d60174f585 Merge pull request #11881 from Ghommie/Ghommie-cit684
Removed that one ss13 slur the code.
2020-04-16 08:29:10 -07:00
GhomandGitHub 13def914b6 Update phobia.json 2020-04-16 17:18:11 +02:00
GhomandGitHub 894579b068 indention 2020-04-16 17:17:15 +02:00
Ghommie 109a69d301 Removed that one infamous ss13 slur the code. 2020-04-16 16:58:36 +02:00
GhomandGitHub 747672eb50 Update update_icons.dm 2020-04-16 16:44:07 +02:00
Ghommie 42b67d9240 PR is ready. 2020-04-16 16:33:04 +02:00
Ghommie fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
CitadelStationBot c7b4715cff Automatic changelog generation for PR #11851 [ci skip] 2020-04-16 07:46:23 -05:00
GhomandGitHub ad6a2b4671 Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4
Contractor kits are now poplocked to 30.
2020-04-16 14:46:20 +02:00