Commit Graph

10980 Commits

Author SHA1 Message Date
Ghommie 54f8c29005 Fixing riding component runtimes, how drifting... 2019-10-29 23:33:35 +01:00
Ghommie 9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
Anonymous 23202e8524 Merge branch 'master' into assu 2019-10-29 17:53:16 +03:00
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie a5086d5813 3 seconds penalties fix 2019-10-29 13:16:36 +01:00
BlackMajor edfa1d0bae Merge pull request #9649 from Thalpy/JacqFixes
[Expedite][Halloween] Damnit Jacq stop bothering the AI
2019-10-29 21:48:35 +13:00
Fermi be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi 5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Thalpy 2636398e60 WEBEDITS 2019-10-29 03:50:49 +00:00
Hatterhat ebd05a3fb1 today i will make a one line fix and steal it from sishen 2019-10-28 22:39:46 -05:00
Thalpy e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy 39f7116353 Oops 2019-10-29 03:22:21 +00:00
BlackMajor ba9c99644d Merge pull request #9640 from Linzolle/hat-toss
I broke hats oops
2019-10-29 10:00:52 +13:00
Ghommie 3b51c3c5be Fixing invisible blackberry n strawberry chocolate cake slices. 2019-10-28 18:20:58 +01:00
Ghommie 8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie 68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
Ghommie a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Anonymous ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
Ghommie f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
BlackMajor 4806c7c788 Dogborg time 2019-10-29 02:05:43 +13:00
BlackMajor cc3eefff29 Merge pull request #9570 from Citadel-Station-13/kevinz000-patch-105
Gives peacekeeper cyborgs a megaphone
2019-10-28 17:02:34 +13:00
BlackMajor 6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
2019-10-28 16:47:02 +13:00
BlackMajor 5ed6de4e26 Merge pull request #9639 from Ghommie/Ghommie-cit283
Quickfixing hypospray missin icons.
2019-10-28 16:30:36 +13:00
deathride58 c1742c0572 applies ghommie's suggested change
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-27 20:41:44 -04:00
Ghommie 13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00
Ghommie 9f0e534a55 only add once. 2019-10-28 01:26:41 +01:00
kevinz000 84c15af767 Merge pull request #9590 from Ghommie/Ghommie-cit260
Ports "All font size spans scale" and cleans up the many browserOutput stylesheets
2019-10-27 17:22:35 -07:00
kevinz000 329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again
fix blood overlays again
2019-10-27 17:21:55 -07:00
Ghommie 96e20f4769 fixing one mistake, and it's ready. 2019-10-28 01:04:31 +01:00
Linzolle 24e5905c38 fuck 2019-10-27 19:02:26 -05:00
Ghommie 2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie 80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000 fae47c58ed Merge pull request #9635 from Thalpy/JacqFixes
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
2019-10-27 16:41:06 -07:00
kevinz000 da387bfdf4 Merge pull request #9620 from YakumoChen/proto_beanbag
Adds Beanbag Slugs to Seclathe
2019-10-27 16:13:31 -07:00
kevinz000 e583412388 Merge pull request #9480 from Poojawa/access-clarifications
Clarifies ID Console descriptions
2019-10-27 16:13:16 -07:00
kevinz000 309cf531aa Merge pull request #9627 from Ghommie/Ghommie-cit279
Unmodularize MkII hyposprays and other reagent items sprites.
2019-10-27 16:09:04 -07:00
kevinz000 d67b7f620d Merge pull request #9613 from Linzolle/hat-toss
Port hat tossing
2019-10-27 16:08:00 -07:00
Thalpy 0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy 6de94a23c0 Oops 2019-10-27 22:32:47 +00:00
Thalpy c30f550274 Well here it is 2019-10-27 22:29:35 +00:00
Linzolle bdd553d4f7 thanks ghom 2019-10-27 17:26:55 -05:00
Thalpy a76ff4efe6 Alright 2019-10-27 19:24:23 +00:00
Thalpy 739de1b378 Fixes 2019-10-27 19:07:06 +00:00
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Anonymous 203509b405 Poll said its DAB 2019-10-27 16:27:03 +03:00
Anonymous d99f0afc0a Merge branch 'master' into assu 2019-10-27 16:08:01 +03:00
Trilbyspaceclone db19eae0f8 Apply suggestions from code review
Grammar

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
2019-10-27 08:44:46 -04:00
kevinz000 dabfba8a0d Merge pull request #9619 from BlackMajor/Yote
Buffs engiborg build potential
2019-10-27 05:38:50 -07:00
kevinz000 8f7270ea3e Update medbot.dm 2019-10-27 05:33:12 -07:00