Commit Graph

966 Commits

Author SHA1 Message Date
Thalpy 8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Fermi bccd3e42b6 Mild tweak 2019-07-03 19:53:38 +01:00
Fermi 42edafc3e6 OOPS 2019-07-03 02:13:18 +01:00
Fermi cd645626c0 expasion OD increase, corrected names and inverted listing of fermichems 2019-07-03 02:11:18 +01:00
Fermi e34c6265e7 Tidying. 2019-07-02 23:46:58 +01:00
Fermi e940cc7ab7 Mild concern over strength of chem. 2019-07-02 23:45:32 +01:00
Fermi 161c5955f2 Removed tastes in buffers. 2019-07-02 23:06:46 +01:00
Fermi 27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Fermi 946fbff999 +Yamerol, tweaked PE, tweaked CM3000, tweaked medpH. 2019-07-02 22:15:32 +01:00
Jay e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
Fermi d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +01:00
Fermi 0f2978d7fd Updated Analysis meter's Analysis. 2019-07-01 14:47:32 +01:00
Fermi 04c3b0e66e Oops. 2019-07-01 14:13:31 +01:00
Fermi 779830e6c7 Compile check. Ready for update. 2019-07-01 14:13:22 +01:00
Thalpy 3c8025c477 Moving computers 2019-07-01 13:56:37 +01:00
Thalpy 48ce61580e Fixes viro oversight. 2019-07-01 12:36:24 +01:00
Thalpy 937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
TrilbySpaceClone 5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
kevinz000 bf6811b981 Merge pull request #8742 from Trilbyspaceclone/MW2_suit
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
2019-06-29 15:18:01 -07:00
Thalpy 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Thalpy 7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
kevinz000 7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
Thalpy 44337c6a08 Forgot to update lists when removing all sizes from GLOB. 2019-06-29 03:16:54 +01:00
Thalpy b6309d5a31 Fixes explosion bug, tweaks hypo and fiddles pH. 2019-06-29 02:47:32 +01:00
Thalpy 4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
deathride58 fb66d382fa Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
2019-06-28 00:47:09 -04:00
deathride58 db6e8ecd4c Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
2019-06-28 00:23:37 -04:00
Thalpy a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Poojawa 00a630abe5 Fixes errant ball behaviour 2019-06-26 07:42:02 -05:00
Fermi afe43070a0 Improved logging and renamed buffer IDs 2019-06-26 12:20:10 +01:00
Fermi 0954f0f50c This is why you always compile test before merging. 2019-06-26 12:07:21 +01:00
Fermi fbf54cd560 Ninja fix. 2019-06-26 12:01:26 +01:00
Fermi 19b79b8232 The great botany purge of our time. 2019-06-26 01:29:34 +01:00
Fermi a53ca38eb9 Lil fix 2019-06-25 23:54:23 +01:00
Fermi e4e3932eb3 Sprites 2019-06-25 23:46:42 +01:00
Fermi 1ad92b9758 Final round of fixes from testing. 2019-06-25 23:44:04 +01:00
Fermi 1f0dec53ff Fixed wrong chem 2019-06-25 23:13:22 +01:00
Fermi 3ccf300052 Fixed empty hypovial 2019-06-25 23:11:43 +01:00
Fermi 3928e027b4 Fixes (see dev discussion) 2019-06-25 23:06:55 +01:00
LetterJay 5f99d9ec04 Fixes wrong item path for donator loadout 2019-06-25 09:50:35 -05:00
TrilbySpaceClone e84fd8942f fix 2019-06-25 03:08:40 -04:00
Trilbyspaceclone 52f100998c Update custom_items.dm 2019-06-25 02:59:49 -04:00
Fermi eb2dc63a54 Oh nooooo I forgot to save!!! 2019-06-25 07:50:44 +01:00
Fermi 4145b0f256 Hotfix for egregious oversights. 2019-06-25 07:22:20 +01:00
TrilbySpaceClone 50aede119b all works 2019-06-25 01:50:35 -04:00
Ghommie 67f00fc049 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42 2019-06-24 16:48:15 +02:00
Fermi 8605d3a246 Found a pH overflow. 2019-06-24 15:06:18 +01:00
TrilbySpaceClone b485d8e750 Saves jay the trouble
Im a good cat
2019-06-24 02:21:04 -04:00
kevinz000 69d48c5e5e Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
Removes Nudity Permits and replaces them with invisible gear harnesses
2019-06-23 17:26:30 -07:00