Commit Graph

  • 10e8d383ac Update configuration.dm kevinz000 2020-01-22 02:25:00 -07:00
  • c345852abb Update human_movement.dm kevinz000 2020-01-22 01:53:53 -07:00
  • 16c14b55ae Update game_options.dm kevinz000 2020-01-22 01:52:43 -07:00
  • e5759f21e3 Update human_movement.dm kevinz000 2020-01-22 01:52:20 -07:00
  • afe9498ebe Update living.dm kevinz000 2020-01-22 01:51:56 -07:00
  • 871ae49192 Update living.dm kevinz000 2020-01-22 01:12:44 -07:00
  • b47f92716e Update human_movement.dm kevinz000 2020-01-22 01:07:06 -07:00
  • ea5f35a457 Update game_options.dm kevinz000 2020-01-22 01:06:50 -07:00
  • 4a40090061 Update human_movement.dm kevinz000 2020-01-22 01:00:29 -07:00
  • b0b90d4d28 Update game_options.dm kevinz000 2020-01-22 00:45:17 -07:00
  • ace1950800 Makes listen checks a tad cheaper. Poojawa 2020-01-22 00:07:39 -06:00
  • a665aeb50f ok just skip this line I guess Poojawa 2020-01-21 23:33:11 -06:00
  • 9415ea095d Fixes blindness on transfers Poojawa 2020-01-21 23:32:32 -06:00
  • e3cb379bde Add the Mining Base as a submap r4d6 2020-01-21 20:31:40 -05:00
  • cc07ef42b7 Revert "Update hud.dm" ShadeAware 2020-01-21 19:09:42 -05:00
  • 6caee5699b Revert "Delete eyes.dmi" ShadeAware 2020-01-21 19:05:02 -05:00
  • 80227c842b Revert "Add files via upload" ShadeAware 2020-01-21 19:05:00 -05:00
  • ff9070fa9d Revert "Delete glasses.dmi" ShadeAware 2020-01-21 19:04:57 -05:00
  • 61d9e0d877 Revert "Add files via upload" ShadeAware 2020-01-21 19:04:54 -05:00
  • ff23bc396a Revert "Revert "Update hud.dm"" ShadeAware 2020-01-21 19:04:40 -05:00
  • 4c9e240ecb Revert "Update hud.dm" ShadeAware 2020-01-21 19:04:36 -05:00
  • e1fb7f3e64 Update hud.dm ShadeAware 2020-01-21 18:49:37 -05:00
  • 50d3b4b78e Add files via upload ShadeAware 2020-01-21 18:45:54 -05:00
  • 413bfc276e Delete glasses.dmi ShadeAware 2020-01-21 18:45:44 -05:00
  • 79ebe54eff Add files via upload ShadeAware 2020-01-21 18:45:24 -05:00
  • 6aba2c1716 Delete eyes.dmi ShadeAware 2020-01-21 18:45:09 -05:00
  • bc1500c04c Update cleanbot.dm Trilbyspaceclone 2020-01-21 18:33:04 -05:00
  • 5e5d80238b Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa. Chayse Ramsay 2020-01-21 22:29:15 +00:00
  • b826926bf9 Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework KathrinBailey 2020-01-21 17:22:17 +00:00
  • 86c5d43a1b Automatic changelog generation for PR #10640 [ci skip] CitadelStationBot 2020-01-21 09:23:42 -06:00
  • 0985d1f1d0 Merge pull request #10640 from r4d6/mapfix Ghom 2020-01-21 16:23:39 +01:00
  • 181984f478 Update materials.dm Trilbyspaceclone 2020-01-21 09:31:38 -05:00
  • 1ae106cca2 Fixes r4d6 2020-01-21 09:23:34 -05:00
  • a98b685acd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l kevinz000 2020-01-21 04:38:32 -07:00
  • ed5172f9ca changes kevinz000 2020-01-20 23:17:58 -07:00
  • 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 kevinz000 2020-01-20 22:47:21 -07:00
  • b5ca546ac3 patch kevinz000 2020-01-20 22:45:21 -07:00
  • 74be93a8cc hasSiliconAccessInArea vars change Seris02 2020-01-21 11:44:49 +08:00
  • c2bcbe868e merge conflicts + getting rid of commented code for now Seris02 2020-01-21 11:23:33 +08:00
  • 25050d7bb6 Automatic changelog generation for PR #10619 [ci skip] CitadelStationBot 2020-01-20 20:37:44 -06:00
  • 8e49c99ca0 Merge pull request #10619 from Seris02/conveyor Ghom 2020-01-21 03:37:42 +01:00
  • 3c53619f2a Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15 Ghom 2020-01-21 03:05:22 +01:00
  • 41191c3974 trauma kevinz000 2020-01-20 19:01:11 -07:00
  • d7192f6944 Automatic changelog generation for PR #10468 [ci skip] CitadelStationBot 2020-01-20 19:26:28 -06:00
  • 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting Ghom 2020-01-21 02:26:25 +01:00
  • 08016a8461 Ghommie commands, I obey. ShadeAware 2020-01-20 20:22:09 -05:00
  • 437392e0d3 Automatic changelog generation for PR #10588 [ci skip] CitadelStationBot 2020-01-20 19:17:41 -06:00
  • c244f95ed9 Merge pull request #10588 from PersianXerxes/tweakEngieField Ghom 2020-01-21 02:17:38 +01:00
  • 9cb11b4414 Automatic changelog generation for PR #10608 [ci skip] CitadelStationBot 2020-01-20 19:13:32 -06:00
  • 4dd576a0ce Merge pull request #10608 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-01-21 02:13:30 +01:00
  • 5abc1104c0 ok kevinz000 2020-01-20 18:03:54 -07:00
  • ccf66eb04a bools kevinz000 2020-01-20 17:59:21 -07:00
  • 221e05b3c8 add line kevinz000 2020-01-20 17:58:58 -07:00
  • 12c832b40b Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit kevinz000 2020-01-20 17:53:06 -07:00
  • bb14b255d2 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-12 kevinz000 2020-01-20 17:51:56 -07:00
  • efe3ebdb53 bet kevinz000 2020-01-20 17:50:07 -07:00
  • fae0d6fe3f remember when i hoped i didnt forget something Hatterhat 2020-01-20 18:06:07 -06:00
  • ad2db72b0d Automatic changelog generation for PR #10635 [ci skip] CitadelStationBot 2020-01-20 18:02:56 -06:00
  • 01080e2ab6 Merge pull request #10635 from Hatterhat/patch-2 Ghom 2020-01-21 01:02:54 +01:00
  • 851815f9c4 Update recipes_weapon_and_ammo.dm ShadeAware 2020-01-20 18:50:57 -05:00
  • 9f488c80a1 Update weaponry.dm ShadeAware 2020-01-20 18:49:04 -05:00
  • c93f16e4d4 Unused variable. Ghommie 2020-01-21 00:45:51 +01:00
  • ddf037da92 Trilby's solar panels PR but improved. Ghommie 2020-01-21 00:28:41 +01:00
  • 348fa8be86 salt pr @kevinz000 Hatterhat 2020-01-20 17:27:51 -06:00
  • 6f243f9c44 Update weaponry.dm ShadeAware 2020-01-20 18:08:05 -05:00
  • cd001411e1 Update recipes_weapon_and_ammo.dm ShadeAware 2020-01-20 18:02:07 -05:00
  • a188f121b4 Add files via upload ShadeAware 2020-01-20 17:38:15 -05:00
  • 2d413d8474 Delete items_and_weapons.dmi ShadeAware 2020-01-20 17:38:01 -05:00
  • d1c45bf588 Add files via upload ShadeAware 2020-01-20 17:36:25 -05:00
  • 99e84b6db8 Delete swords_righthand.dmi ShadeAware 2020-01-20 17:36:04 -05:00
  • 034eb84c65 Delete swords_lefthand.dmi ShadeAware 2020-01-20 17:35:53 -05:00
  • ffef7cd4db Update weaponry.dm ShadeAware 2020-01-20 17:33:18 -05:00
  • 0661bc2558 Update PDA.dm kevinz000 2020-01-20 15:26:24 -07:00
  • 62c5fabcac oops Commandersand 2020-01-20 15:18:08 -06:00
  • a3f8233130 MEM Commandersand 2020-01-20 15:15:28 -06:00
  • 89bb60ac16 Update parts.dm Trilbyspaceclone 2020-01-20 16:12:40 -05:00
  • 9eb9f08a92 Update glassware.dm Trilbyspaceclone 2020-01-20 16:11:42 -05:00
  • ab464de0b7 Update glass.dm Trilbyspaceclone 2020-01-20 16:10:12 -05:00
  • 038f5e4b0e Yea, sorry for being so naive right now. Ghom 2020-01-20 21:59:12 +01:00
  • a921b27c63 I want a different maintainer to merge this now. Ghom 2020-01-20 21:58:21 +01:00
  • 9604b27482 github web editor is so bad Ghommie 2020-01-20 21:55:02 +01:00
  • 5500e349e3 Merge branch 'master' into kevinz000-patch-10 Ghom 2020-01-20 21:48:28 +01:00
  • 9ea6e896fb Kevinz, please. Ghom 2020-01-20 21:43:00 +01:00
  • cd48f1a152 forcewall Commandersand 2020-01-20 14:22:23 -06:00
  • b1a4cc0406 renormalize Ghommie 2020-01-20 21:17:06 +01:00
  • 5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 Ghommie 2020-01-20 20:59:38 +01:00
  • 6e31db958c fixes kevinz000 2020-01-20 12:08:18 -07:00
  • a99090ddbf Automatic changelog generation for PR #10617 [ci skip] CitadelStationBot 2020-01-20 13:02:09 -06:00
  • 4c6af66050 Merge pull request #10617 from Citadel-Station-13/kevinz000-patch-16 Ghom 2020-01-20 20:02:06 +01:00
  • a53511a53d Update cloning.dm kevinz000 2020-01-20 11:28:27 -07:00
  • 5bc7229a9f Quick rubber toolbox materials fix. Ghom 2020-01-20 19:11:43 +01:00
  • 06e23144a8 Automatic changelog generation for PR #10621 [ci skip] CitadelStationBot 2020-01-20 11:50:27 -06:00
  • 28a6e6eccf Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this Ghom 2020-01-20 18:50:25 +01:00
  • 5bd2b13233 Automatic changelog generation for PR #10615 [ci skip] CitadelStationBot 2020-01-20 11:04:34 -06:00
  • b85e752e46 Merge pull request #10615 from keronshb/RemoteMoodResearch Ghom 2020-01-20 18:04:31 +01:00
  • 815b4f033d made flavor things a game option + more hoard Putnam 2020-01-20 04:13:54 -08:00
  • 8b21a60ac9 MF Line endings Artur 2020-01-20 14:09:22 +02:00
  • f5ad854c2c Conflict fix Artur 2020-01-20 13:50:52 +02:00
  • dfaa3bf15c Added another flavor obj, "horde" to "hoard" Putnam 2020-01-20 03:46:44 -08:00
  • 782125b339 Backend? Artur 2020-01-20 13:42:10 +02:00