Commit Graph

14466 Commits

Author SHA1 Message Date
Arturlang 0a545da35d Webedit galore 2020-01-22 18:12:26 +01:00
Arturlang e025c8a743 Oh right its a typo 2020-01-22 18:11:37 +01:00
Trilbyspaceclone ebb6ac1d7b more words 2020-01-22 11:33:39 -05:00
kevinz000 c4475b1dda variables 2020-01-22 05:39:16 -07:00
kevinz000 a28ebcc041 variables 2020-01-22 05:38:53 -07:00
kevinz000 ccb5d32ab2 varnames 2020-01-22 05:38:09 -07:00
kevinz000 ff98fe7bf5 update 2020-01-22 05:35:21 -07:00
kevinz000 a8628cee33 udpates 2020-01-22 05:32:57 -07:00
kevinz000 9ef3879e53 fix 2020-01-22 05:17:59 -07:00
kevinz000 5b6f95cb1e shuttle hijack 2020-01-22 05:16:33 -07:00
Poojawa ace1950800 Makes listen checks a tad cheaper.
Improves external sounds with falloff
2020-01-22 00:07:39 -06:00
Poojawa a665aeb50f ok just skip this line I guess 2020-01-21 23:33:11 -06:00
Poojawa 9415ea095d Fixes blindness on transfers 2020-01-21 23:32:32 -06:00
ShadeAware cc07ef42b7 Revert "Update hud.dm"
This reverts commit e1fb7f3e64.
2020-01-21 19:09:42 -05:00
ShadeAware ff23bc396a Revert "Revert "Update hud.dm""
This reverts commit 4c9e240ecb.
2020-01-21 19:04:40 -05:00
ShadeAware 4c9e240ecb Revert "Update hud.dm"
This reverts commit e1fb7f3e64.
2020-01-21 19:04:36 -05:00
ShadeAware e1fb7f3e64 Update hud.dm 2020-01-21 18:49:37 -05:00
Trilbyspaceclone bc1500c04c Update cleanbot.dm 2020-01-21 18:33:04 -05:00
Chayse Ramsay 5e5d80238b Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.
2020-01-21 22:29:15 +00:00
Trilbyspaceclone 181984f478 Update materials.dm 2020-01-21 09:31:38 -05:00
kevinz000 a98b685acd Merge remote-tracking branch 'citadel/master' into the-p-o-o-l 2020-01-21 04:38:32 -07:00
kevinz000 ed5172f9ca changes 2020-01-20 23:17:58 -07:00
kevinz000 8f60d01208 Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8 2020-01-20 22:47:21 -07:00
kevinz000 b5ca546ac3 patch 2020-01-20 22:45:21 -07:00
Seris02 74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02 c2bcbe868e merge conflicts + getting rid of commented code for now 2020-01-21 11:23:33 +08:00
Ghom 8e49c99ca0 Merge pull request #10619 from Seris02/conveyor
conveyor updates
2020-01-21 03:37:42 +01:00
Ghom 3c53619f2a Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15
Renames created volume in pyrotechnics to multiplier to alleviate confusion
2020-01-21 03:05:22 +01:00
kevinz000 41191c3974 trauma 2020-01-20 19:01:11 -07:00
Ghom 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
2020-01-21 02:26:25 +01:00
kevinz000 efe3ebdb53 bet 2020-01-20 17:50:07 -07:00
Hatterhat fae0d6fe3f remember when i hoped i didnt forget something 2020-01-20 18:06:07 -06:00
ShadeAware 851815f9c4 Update recipes_weapon_and_ammo.dm 2020-01-20 18:50:57 -05:00
Ghommie ddf037da92 Trilby's solar panels PR but improved. 2020-01-21 00:28:41 +01:00
Hatterhat 348fa8be86 salt pr @kevinz000 2020-01-20 17:27:51 -06:00
ShadeAware cd001411e1 Update recipes_weapon_and_ammo.dm 2020-01-20 18:02:07 -05:00
Commandersand 62c5fabcac oops 2020-01-20 15:18:08 -06:00
Commandersand a3f8233130 MEM 2020-01-20 15:15:28 -06:00
Trilbyspaceclone 89bb60ac16 Update parts.dm 2020-01-20 16:12:40 -05:00
Trilbyspaceclone 9eb9f08a92 Update glassware.dm 2020-01-20 16:11:42 -05:00
Trilbyspaceclone ab464de0b7 Update glass.dm 2020-01-20 16:10:12 -05:00
Ghom 038f5e4b0e Yea, sorry for being so naive right now. 2020-01-20 21:59:12 +01:00
Ghom a921b27c63 I want a different maintainer to merge this now. 2020-01-20 21:58:21 +01:00
Ghommie 9604b27482 github web editor is so bad 2020-01-20 21:55:02 +01:00
Ghom 5500e349e3 Merge branch 'master' into kevinz000-patch-10 2020-01-20 21:48:28 +01:00
Ghom 9ea6e896fb Kevinz, please. 2020-01-20 21:43:00 +01:00
Commandersand cd48f1a152 forcewall 2020-01-20 14:22:23 -06:00
Ghommie 5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
kevinz000 6e31db958c fixes 2020-01-20 12:08:18 -07:00
Ghom 28a6e6eccf Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this
.357 AP printable from illegal ballistics
2020-01-20 18:50:25 +01:00