Commit Graph

14466 Commits

Author SHA1 Message Date
Ghommie 58c7c0291b ...? ...? 2020-01-25 05:22:05 +01:00
kevinz000 78b901f66f spacing is a pet peeve 2020-01-24 21:18:51 -07:00
kevinz000 24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
Ghommie 5cf7c259fa Runtimenator 2: Compile-net 2020-01-25 02:39:58 +01:00
Ghommie f2b04be561 More Runtimenator fixes. 2020-01-25 02:16:45 +01:00
Hatterhat 4db9eadaf1 drake armor deserves to be good 2020-01-24 18:16:40 -06:00
Ghommie 8e0c06e50e Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ? 2020-01-25 00:32:27 +01:00
kevinz000 ac6695bd68 Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
2020-01-24 16:15:44 -07:00
kevinz000 147c0d8852 Merge pull request #10680 from Ghommie/Ghommie-cit518
snowflake-friendly towels.
2020-01-24 16:15:27 -07:00
kevinz000 afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
2020-01-24 16:14:49 -07:00
kevinz000 ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
kevinz000 a52b4feaba Update glass.dm 2020-01-24 16:04:50 -07:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Ghommie 856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Ghom 2884bbdc23 I'm exiting this code. 👀 2020-01-24 22:15:33 +01:00
Ghom ba50b4a851 Risky web edit, disgusting contents. 2020-01-24 22:13:55 +01:00
Ghommie 32ee2f6197 minor pet peeve with the anomalous honking crystal & co. 2020-01-24 21:51:24 +01:00
kevinz000 57c77a4f30 typo 2020-01-24 13:14:53 -07:00
Putnam c58b4daa35 collectors too
this doesn't compile but like. it's a draft
2020-01-24 11:58:58 -08:00
Ghommie 6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
Putnam 847b3c0a09 Fixed flavor objectives and added more. 2020-01-24 10:46:07 -08:00
Ghommie c69032ff42 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-24 18:56:27 +01:00
Artur ff8289c177 Fixes 2020-01-24 18:48:50 +01:00
Ghom d5daae98c7 Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
Putnam 0493db0ac6 allowed dojo banning, made dojo mobs dust upon leaving 2020-01-24 09:11:33 -08:00
Ghom d3531aade2 Makes transfer_ckey crash logging less pedant. 2020-01-24 17:06:38 +01:00
Ghom f5d8e447eb Merge pull request #10676 from Kraseo/virgohairs
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
kevinz000 3b51c0dbe9 how did i get maintainer again 2020-01-24 04:48:24 -07:00
kevinz000 73975aec2b pls compile i didn't webedit that last commit please forgive my sins!! 2020-01-24 04:39:51 -07:00
kevinz000 fc684da88d more reasonable 2020-01-24 04:31:54 -07:00
kevinz000 93a27d05b4 Revert "nvm"
This reverts commit 5832b4d9b0.
2020-01-24 04:22:24 -07:00
kevinz000 5832b4d9b0 nvm 2020-01-24 04:21:41 -07:00
kevinz000 1043be4fd7 Update holder.dm 2020-01-24 04:14:43 -07:00
kevinz000 d2a23ef403 Update holder.dm 2020-01-24 04:11:37 -07:00
kevinz000 d9a5d12c63 Revert atmos 2020-01-24 03:42:55 -07:00
kevinz000 bedb42f147 Merge remote-tracking branch 'citadel/master' into optimization_1 2020-01-24 03:41:40 -07:00
Seris02 10ef39d1e3 maybe it'll work 2020-01-24 16:33:20 +08:00
kevinz000 f626322fbd Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
2020-01-24 00:32:57 -07:00
kevinz000 831ac91917 Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
kevinz000 7cd6490e86 Merge pull request #10526 from Seris02/bowmanupgrade
allows headsets to be bowmanized and adds a traitor item for that
2020-01-24 00:21:34 -07:00
kevinz000 6ffdc1642b Merge pull request #10632 from Commandersand/nerd
buffs some wiz spell cooldonws and changes some incantation phrases
2020-01-24 00:18:41 -07:00
kevinz000 a5ddd4efa9 Update hilbertshotel.dm 2020-01-24 00:01:02 -07:00
loginsandylogout a7a3a3a417 Update code/modules/spells/spell_types/lightning.dm
po

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-23 22:52:18 -06:00
Ghommie a6c3917bfc M H M H 2020-01-24 05:01:51 +01:00
Ghommie 95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
Ghommie bd6e364612 But wait, there is more!
No...
2020-01-24 04:33:55 +01:00
Ghommie 1ba4c19c64 A couple more. 2020-01-24 03:50:44 +01:00
Ghommie 67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
Seris02 90c7149d8c merge conflict fixes 2020-01-24 10:27:48 +08:00
kevinz000 40a2698b55 Update emergency.dm 2020-01-23 19:22:00 -07:00