Commit Graph

19834 Commits

Author SHA1 Message Date
Ghommie 6fa454dfe7 r 2019-07-11 09:01:57 +02:00
Ghommie bef0027287 In a haste, we forget thousand things. 2019-07-11 08:50:47 +02:00
Ghommie 26ab7cc522 Ports "Show codewords on round end screen" 2019-07-11 08:40:11 +02:00
Ghommie 081c07098f randomizing colors. 2019-07-11 08:08:07 +02:00
kevinz000 c30a3aafb6 Update nanites.dm 2019-07-10 22:49:31 -07:00
kevinz000 239d688fe4 Update weapon.dm 2019-07-10 22:47:29 -07:00
kevinz000 db05432778 Update nanites.dm 2019-07-10 22:44:21 -07:00
Ghommie 143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
kevinz000 2995b22907 Update nanites.dm 2019-07-10 22:38:43 -07:00
Trilbyspaceclone 27a8876e99 I dont care anymore, It works in testing to function fine
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
2019-07-11 01:15:39 -04:00
kevinz000 05a01fe028 Update nanite_program_hub.dm 2019-07-10 22:11:16 -07:00
kevinz000 564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187
[Ready] Tweaks shields
2019-07-10 22:02:19 -07:00
kevinz000 84d6fbe249 Update weapon.dm 2019-07-10 22:00:28 -07:00
Trilbyspaceclone 146276014c Update other_reagents.dm 2019-07-10 20:42:12 -04:00
Poojawa c4f736eb94 Merge branch 'master' into job-menu-improvements 2019-07-10 18:55:29 -05:00
Trilbyspaceclone 48e15307c5 Update other_reagents.dm 2019-07-10 19:14:57 -04:00
Trilbyspaceclone ac9c672fa8 I guess this is better 2019-07-10 18:56:32 -04:00
Trilbyspaceclone ed89ac874b this was fine 2019-07-10 18:44:14 -04:00
Trilbyspaceclone 5ea9d998fd k_elasticity = 0 2019-07-10 18:32:55 -04:00
Trilbyspaceclone baf4529e52 Update other_reagents.dm 2019-07-10 18:32:10 -04:00
Trilbyspaceclone d53d11de6b Apply suggestions from code review
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-07-10 18:21:03 -04:00
Fermi 8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. 2019-07-10 21:35:47 +01:00
kevinz000 a9c41c0fc7 hm 2019-07-10 10:00:45 -07:00
kevinz000 c14a052eeb Update weapon.dm 2019-07-10 03:06:32 -07:00
BlackMajor 2717590e9f No more fat smites 2019-07-10 21:01:41 +12:00
Trilbyspaceclone c9e13f8d62 better wording* 2019-07-10 02:43:18 -04:00
TrilbySpaceClone 54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Trilbyspaceclone e1ed96f419 Update other_reagents.dm 2019-07-09 23:08:11 -04:00
Trilbyspaceclone b03c197d0e forgot the var 2019-07-09 22:58:13 -04:00
Trilbyspaceclone 6240222ed7 Update other_reagents.dm 2019-07-09 21:58:22 -04:00
Fermi aece9b31ed Mistakessss! 2019-07-09 23:28:12 +01:00
Fermi ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Ghommie ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Fermi c12c5be2b6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-09 20:36:19 +01:00
Fermi 3a2192ec2e Hotfix for captain. 2019-07-09 20:36:16 +01:00
kevinz000 b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120
Fixes rocket launchers, buffing their accuracy etc.
2019-07-09 08:30:44 -07:00
kevinz000 69f06444e6 smgs 2019-07-09 08:20:45 -07:00
kevinz000 a2d52c0ed9 HERE WE GO AGAIN. 2019-07-09 07:55:44 -07:00
Trilbyspaceclone f37e1bf01b Merge branch 'master' into Unmodular 2019-07-09 03:14:49 -04:00
kevinz000 7bca0c6d88 Update nanites.dm 2019-07-08 23:48:22 -07:00
kevinz000 fafac3fba6 Update utility.dm 2019-07-08 23:45:21 -07:00
Ghommie 9cf2dea999 Grille spam. 2019-07-09 08:35:32 +02:00
Ghommie 3546ed9799 Stamina damtype weaponry fixes. 2019-07-09 08:33:43 +02:00
Ghommie 490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Tupinambis 8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Thalpy c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Tupinambis 0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
Ghommie 5b97a7533d it only affects maploaded items anyway. 2019-07-09 04:34:13 +02:00
Fermi 1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
kevinz000 30a006e42f additions, and it now nulls out. 2019-07-08 18:21:04 -07:00