Commit Graph

172 Commits

Author SHA1 Message Date
Poojawa
3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes 2019-08-15 08:24:55 -05:00
Poojawa
f76bb27127 Fixes some runtimes and removes a holodeck exploit
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
Fermi
3512d5eaec MK only pacifies on withdrawal now. 2019-07-16 06:00:40 +01:00
Fermi
d8a46dd0e3 Another fix to reduce spam. 2019-07-15 23:10:16 +01:00
Fermi
c746cb3078 Quick fix 2019-07-15 23:07:49 +01:00
Fermi
110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Fermi
ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Fermi
3a2192ec2e Hotfix for captain. 2019-07-09 20:36:16 +01:00
Fermi
1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
Fermi
e7224991b7 Few fixes 2019-07-08 23:06:01 +01:00
Fermi
c3ac34158a Fixed shock command. 2019-07-08 19:51:10 +01:00
Fermi
b163f56eb3 Guess what it didn't work. 2019-07-07 16:16:02 +01:00
Fermi
30322f1163 TO BE TESTED 2019-07-07 06:29:55 +01:00
Fermi
e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01:00
Fermi
6db1a1576d Rewrote explosion code. 2019-07-06 18:08:07 +01:00
Fermi
d7ac87c99b Tweaks 2019-07-06 17:04:24 +01:00
Fermi
5f72277549 Succumb tweak. Ready to merge. 2019-07-02 23:24:35 +01:00
Fermi
381e12f04a Fixing message_admins. 2019-07-02 22:52:45 +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
Fermi
d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +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
e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Thalpy
44337c6a08 Forgot to update lists when removing all sizes from GLOB. 2019-06-29 03:16:54 +01:00
Thalpy
b8028242c0 Compile fixes 2019-06-28 17:16:21 +01:00
Thalpy
4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Fermi
afe43070a0 Improved logging and renamed buffer IDs 2019-06-26 12:20:10 +01:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Fermi
b309490190 Forgot to ctrl+s 2019-06-23 19:02:53 +01:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
2019-06-23 06:00:27 -07:00
Fermi
7c19f5e0fa Forgot to comment out hypnoquirk. 2019-06-23 13:06:45 +01:00
Fermi
f7696041ca Fumblefingered some numbers. 2019-06-23 03:43:36 +01:00
Fermi
537161dd01 Lil flavour tweaks. 2019-06-23 03:22:54 +01:00
Fermi
21c17813b8 Guess who should've compile tested! 2019-06-23 01:20:11 +01:00
Fermi
59b6d85c4e Few phrasing and span editing fixes. 2019-06-22 21:59:20 +01:00
Fermi
f096e8440a Finally fixed the vocalchord button 2019-06-22 21:00:20 +01:00
Fermi
226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6 Split custom echo code into it's own call to reduce overhead. 2019-06-22 12:18:38 +01:00
Fermi
ee9d234af6 Spelling, again. 2019-06-20 03:09:38 +01:00
Fermi
7a3542fc5c Double messages. 2019-06-20 02:49:30 +01:00
Fermi
79d176336c A few minor fixes. 2019-06-15 11:36:38 +01:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Fermi
d7cffadc13 Fixes 2019-06-14 13:43:57 +01:00
Fermi
aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
da6f1da624 The great src cull 2019-06-13 04:53:33 +01:00