shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,949 Commits 5 Branches 0 Tags
34cfd2c1e363c3fb1dfb2bc6544d805fcaeb85f2
Commit Graph

9045 Commits

Author SHA1 Message Date
kevinz000
280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil 
Zelus oil - CWC gear
 2019-07-12 07:41:28 -07:00
kevinz000
53642c5104 Merge pull request #8842 from UristMcAstronaut/master 
allows pais to activate holoform while in a pai connector
 2019-07-12 07:36:48 -07:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
kevinz000
aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness 
Makes combat boots look T A C T I C O O L
 2019-07-12 07:33:36 -07:00
BurgerLua
5bd2f28d69 Removed #C8A5DC 2019-07-12 01:02:43 -07:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Ghommie
ed9213066c Speedports "Fixes clockwork armor armor" 2019-07-12 06:09:16 +02:00
kevinz000
c76f6b8a54 Merge pull request #8862 from BlackMajor/Burgit-Branch-2 
Admin cream pie smite no longer makes its victims fat
 2019-07-11 04:57:50 -07:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
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
239d688fe4 Update weapon.dm 2019-07-10 22:47:29 -07:00
Ghommie
143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02: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
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
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
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
Trilbyspaceclone
f37e1bf01b Merge branch 'master' into Unmodular 2019-07-09 03:14:49 -04:00
kevinz000
fafac3fba6 Update utility.dm 2019-07-08 23:45:21 -07: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
Thalpy
c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Fermi
1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
deathride58
e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15 
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
 2019-07-08 18:15:20 -04:00
deathride58
9c0c4c8f59 Merge pull request #8683 from Citadel-Station-13/kevinz000-patch-3 
Fixes end of round notify command, makes it so everyone can use it rather than just staff
 2019-07-08 18:14:08 -04:00
deathride58
42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
deathride58
b8e34d1cab Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12 
[s] RCD logging
 2019-07-08 18:07:27 -04:00
deathride58
59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix 
Fixes trauma healing nanites.
 2019-07-08 18:07:04 -04:00
deathride58
947d33129c Merge pull request #8771 from Citadel-Station-13/kevinz000-patch-20 
buffs wheelchair movespeeds/changes a floor in the equation to a round
 2019-07-08 18:05:15 -04:00