Commit Graph
22777 Commits
Author SHA1 Message Date
kevinz000 e3487b2adf boy oh boy 2020-06-08 21:08:40 -07:00
GhomandGitHub 907d909861 Merge pull request #12493 from DeltaFire15/eldritch-affairs-exploit-fix
[s] xenobio golems can no longer be used to exploit eldritch affairs mechanics
2020-06-09 02:22:04 +02:00
DeltaFire e2466f1e22 tiny bit of better performance 2020-06-08 21:29:29 +02:00
Ghommie a323fe01d3 This should be fine now. 2020-06-08 20:22:16 +02:00
9866f19eb3 Update code/game/say.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-08 11:18:24 -07:00
Ghommie c246e13693 Ok. 2020-06-08 19:15:51 +02:00
DeltaFire bacd5b8478 oops 2020-06-08 19:10:39 +02:00
DeltaFire c29be22f9b no more gamer time 2020-06-08 19:06:41 +02:00
LinandGitHub 52d6069e40 Merge pull request #12446 from kevinz000/hotkey_fixes
Adds modifier-independent hotkey bindings
2020-06-08 11:28:49 -05:00
LinandGitHub 1e3fd46c2d Merge pull request #12472 from Citadel-Station-13/kevinz000-patch-9
makes default photosynthesis MUCH less punishing
2020-06-08 11:25:15 -05:00
NopemanMcHaltandGitHub e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447)
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
2020-06-08 09:14:19 -07:00
DeltaFire15andGitHub efddaa8cad removes early return (#12483)
This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it.
2020-06-08 09:10:06 -07:00
GhomandGitHub f3af445c94 Update material_container.dm (#12491) 2020-06-08 09:09:53 -07:00
kevinz000 b3afed69f4 huffles 2020-06-08 08:47:06 -07:00
kevinz000 2c5e8e2f6a fix 2020-06-08 06:51:03 -07:00
kevinz000 dcca70e94a fix 2020-06-08 06:46:19 -07:00
kevinz000 474873cc62 sigh 2020-06-08 05:19:22 -07:00
GhomandGitHub 881dfe81c5 Merge pull request #12187 from Trilbyspaceclone/patch-373
Nerfs cargo gas selling - MK different pr then the one that addresses this
2020-06-08 08:21:07 +02:00
Ghommie 9e19c0bb17 AAAAAA 2020-06-08 08:19:47 +02:00
Ghommie ad6b835e8b Linter. 2020-06-08 08:12:29 +02:00
Ghommie afff7472d6 ok 2020-06-08 07:39:48 +02:00
TrilbyspacecloneandGitHub 6cf4985360 Update large_objects.dm 2020-06-08 01:09:27 -04:00
TrilbyspacecloneandGitHub abaf633ab9 Update large_objects.dm 2020-06-08 01:09:06 -04:00
kevinz000andGitHub f1f655268d Update volumetrics.dm 2020-06-07 22:02:45 -07:00
kevinz000 e47ed9356f spelling 2020-06-07 21:45:07 -07:00
kevinz000 a4a0295312 ok 2020-06-07 21:27:36 -07:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
GhomandGitHub 911e45e526 Merge pull request #12443 from timothyteakettle/fix-blueprints
fixes dumb blueprint bug to do with noteleport
2020-06-08 00:38:02 +02:00
GhomandGitHub 8ba5c8f690 Merge pull request #12444 from shellspeed1/Makes-internal-tanks-printable
Makes internal tanks printable at the engineering lathe
2020-06-08 00:37:26 +02:00
GhomandGitHub 1f65381a09 Merge pull request #12463 from DeltaFire15/ling-specialrole-fuckery
Quick ling on_removal() fix
2020-06-08 00:35:45 +02:00
GhomandGitHub 231c11a6ad Merge pull request #12465 from Linzolle/shotgun-fix
shotguns no longer delete shells in their chamber after firing
2020-06-08 00:34:31 +02:00
GhomandGitHub 941525c74a Merge pull request #12462 from timothyteakettle/fix-kudzu
fixes spacevines
2020-06-08 00:33:51 +02:00
GhomandGitHub 0b0d70fca9 Merge pull request #12464 from DeltaFire15/keycard-auth-changes
Makes keycard authentication devices... actually authenticate keycards.
2020-06-08 00:32:10 +02:00
TheSpaghettiandGitHub e4763b5f6e let's try that again
more insectoid insects
2020-06-07 18:12:49 -04:00
kevinz000andGitHub 5b863e7e9b Update photosynthesis.dm 2020-06-07 03:43:41 -07:00
kevinz000andGitHub 6f62cb8678 Update photosynthesis.dm 2020-06-07 03:40:34 -07:00
kevinz000andGitHub 210c873fe6 Update martyr.dm 2020-06-07 02:12:28 -07:00
kevinz000andGitHub 7b69daffd7 Update hijack.dm 2020-06-07 02:12:12 -07:00
kevinz000andGitHub 35abf4ffc9 Update traitor_class.dm 2020-06-07 02:11:43 -07:00
kevinz000andGitHub eceb46d02b Update datum_traitor.dm 2020-06-07 02:10:28 -07:00
Linzolle fe6cf2dd44 ramsay broke every shotgun 2020-06-06 14:22:23 -05:00
DeltaFire 0cfbee9809 modifies keycard authentification devices
They now actually require an ID to authentificate instead of just 'access' to it.
Additionally, one can no longer initiate and confirm actions with the same ID.
2020-06-06 18:08:30 +02:00
DeltaFire fe39ffe033 quick oneline thing 2020-06-06 17:07:50 +02:00
Timothy Teakettle 994ab8ac16 fixes spacevines 2020-06-06 16:00:26 +01:00
kevinz000 0e2fb9801e woops 2020-06-05 00:59:18 -07:00
kevinz000 7891c77ea9 text2num 2020-06-05 00:41:48 -07:00
kevinz000 ee2a2ad017 fix 2020-06-05 00:24:01 -07:00
kevinz000 a2d131646f sigh 2020-06-05 00:01:02 -07:00
kevinz000 26b541dc42 css sucks 2020-06-04 23:41:40 -07:00
kevinz000 ee5b209932 eh 2020-06-04 23:27:50 -07:00