Commit Graph

21280 Commits

Author SHA1 Message Date
necromanceranne b5872bba63 Pretty sure this should now use the correct sprites 2020-03-17 02:43:44 +11:00
necromanceranne 19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11:00
kevinz000 8fdb1e5964 Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
2020-03-16 06:12:40 -07:00
Seris02 b8e8a81d1c there 2020-03-16 20:49:10 +08:00
kevinz000 6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000 a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000 c35ffacf50 k 2020-03-16 04:29:18 -07:00
kevinz000 763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000 2a9e4bebdd priority 2020-03-16 04:24:18 -07:00
kevinz000 69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000 857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000 644273beca k 2020-03-16 04:09:25 -07:00
kevinz000 94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000 d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000 09e1be9651 block args 2020-03-16 03:32:12 -07:00
kevinz000 703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000 5d2fb654e8 k 2020-03-16 03:23:09 -07:00
kevinz000 9ead492bb0 changes 2020-03-16 00:28:18 -07:00
Detective Google 828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
BlackMajor 97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
Detective Google 815844accd corrects sechud requirement. 2020-03-16 01:48:29 -05:00
Detective Google 94f694e568 adds some hudpatches
seemed like fun flavor, inspired by bay and a request.
2020-03-16 01:44:26 -05:00
Trilbyspaceclone ff035f2775 Update unsorted.dm 2020-03-16 02:38:25 -04:00
Hatterhat 1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
kevinz000 fae84f9ee6 Merge pull request #11462 from Ghommie/Ghommie-cit621
Fixing some bug reports.
2020-03-15 23:03:59 -07:00
kevinz000 f927793118 Merge pull request #11474 from kappa-sama/patch-17
halves the firebeath mutation's cooldown to 1 minute from 2 minutes
2020-03-15 23:03:10 -07:00
Ghommie 4c87f2256c genetics 2020-03-16 02:04:48 +01:00
Seris02 259bb03969 fixes the swapping of buttons (#11475) 2020-03-16 01:57:55 +01:00
Ghommie 5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie 2553384c6e Shortcut fix for a sticky situation. 2020-03-16 01:23:12 +01:00
Ghom a1618a4550 Webedit fixing a runtime. 2020-03-16 00:35:19 +01:00
Ghommie 8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Ghommie f93445aa31 .yeH 2020-03-15 22:46:32 +01:00
Ghommie 15e2cb9cde Hey. 2020-03-15 22:45:05 +01:00
Ghommie 1fc62b9e99 split flags from signals. 2020-03-15 22:43:58 +01:00
Ghommie 312ef1d961 Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:38:42 +01:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Ghom 2b9f352a14 Fixing a couple issues with recyclers. 2020-03-15 22:12:55 +01:00
Hatterhat 802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
kevinz000 339ea13e00 Update beam_rifle.dm (#11477) 2020-03-15 20:54:23 +01:00
Ghommie 0ce0265420 fixing missing icons for survival pod machinery. 2020-03-15 20:47:37 +01:00
Ghom 4020c67956 Update snacks_pie.dm 2020-03-15 16:16:28 +01:00
Ghommie b453a25e14 Something about banana pies, runtime errors and warnings. 2020-03-15 15:41:32 +01:00
Ghommie 5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000 b7c3ada3e5 nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438)
* Update status_procs.dm

* Update status_procs.dm

* travis

* aight bet
2020-03-15 13:08:52 +01:00
Ghom d8a6e9b94f Merge branch 'master' into Ghommie-cit621 2020-03-15 13:07:45 +01:00
kevinz000 2139bfdb5f Merge pull request #11290 from Putnam3145/traitor-types
Traitor classes: a new paradigm.
2020-03-15 01:35:30 -07:00
kevinz000 0b809dd9ec Merge pull request #11455 from Trilbyspaceclone/patch-309
Nerfs paper work - Again
2020-03-14 22:22:16 -07:00
kevinz000 195a3b593b Merge pull request #11458 from Trilbyspaceclone/patch-310
Buffs borg hypos - Anti-radiation addition
2020-03-14 22:21:32 -07:00
kevinz000 4d79230f87 Merge pull request #11467 from Kraseo/i-love-spaceruins
Adds a blacklist to contractor dropoff areas
2020-03-14 22:11:21 -07:00