shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,126 Commits 5 Branches 0 Tags
cb39ba34918ba002cd70b196ced8c2b2be2004fd
Commit Graph

4608 Commits

Author SHA1 Message Date
Lin
7cc7d6884a Merge pull request #11820 from kevinz000/shield_bashing 
Shield bashing
 2020-04-17 20:45:40 +00:00
kevinz000
7756682362 Merge pull request #11774 from Trilbyspaceclone/tools_andstuff 
More mapping Loot tables and code improvements + Maints/Locker loot changes
 2020-04-17 05:51:26 -07:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07:00
jjpark-kb
4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
Ghommie
2200c690f7 configs 2020-04-16 18:44:05 +02:00
Ghommie
fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
kevinz000
e533103ed2 Merge branch 'master' into shield_bashing 2020-04-15 19:34:08 -07:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Trilbyspaceclone
34397a5d17 Update lootdrop.dm 2020-04-14 10:13:23 -04:00
Trilbyspaceclone
2ebf23a32d Update utility_closets.dm 2020-04-14 10:12:27 -04:00
Trilbyspaceclone
e7247c6a60 Update wallets.dm 2020-04-14 10:11:37 -04:00
Trilbyspaceclone
5833ed8029 Merge branch 'master' into tools_andstuff 2020-04-14 10:10:32 -04:00
Ghom
49e36e47ff Merge pull request #11809 from kevinz000/storage_rework 
Adds baystation-style volumetric space storage support
 2020-04-14 13:17:11 +02:00
Ghom
5d01e05991 Merge pull request #11618 from Arturlang/Garlic 
Adds garlic, and tweaks bloodsuckers a bunch.
 2020-04-14 12:38:34 +02:00
kevinz000
5baa5ebf55 Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2 
Fixes toilet cistern loot spawning on the floor.
 2020-04-14 01:35:04 -07:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
kevinz000
6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
kevinz000
8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671 
Fixes and standarizes a few liver troubles. Re-enables liver failure.
 2020-04-12 17:01:50 -07:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
kevinz000
d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
Ghom
863ecf6627 Update watercloset.dm 2020-04-12 07:17:50 +02:00
Ghom
23b45c9cf3 Update lootdrop.dm 2020-04-12 06:54:40 +02:00
Ghom
501b4f0e3e Update watercloset.dm 2020-04-12 06:42:08 +02:00
Ghom
a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags 
[Ready]Better crate options
 2020-04-12 05:48:20 +02:00
kevinz000
6f5c1bac08 harmful 2020-04-11 08:37:53 -07:00
kevinz000
de296c8879 Merge branch 'shield_bashing' of github.com-kevinz000:kevinz000/Citadel-Station-13 into shield_bashing 2020-04-11 08:37:30 -07:00
kevinz000
bcf77458dd nicer way to bash people 2020-04-11 08:37:02 -07:00
kevinz000
ab1d7c29ad Update shields.dm 2020-04-11 08:28:02 -07:00
kevinz000
eacc783f09 k 2020-04-11 08:23:25 -07:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
kevinz000
b39eb60c4a shield bashing 2020-04-11 07:30:23 -07:00
kevinz000
f3537f38e6 shield bashing 2020-04-11 07:09:50 -07:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Akrilla
747be9cbe4 Better random plush spawning (#11792) 
* better spawning

* check list size

* changes
 2020-04-11 01:59:29 +02:00
Ghommie
af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
Ghom
7d67eee24c Update RCL.dm 2020-04-10 15:51:09 +02:00
kevinz000
d149ce47a6 ok 2020-04-09 21:31:35 -07:00
ForrestWick
0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie
d2b624a908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-09 14:59:40 +02:00
kevinz000
7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix 
TGUI Next vendors plus spritesheet port from TG
 2020-04-09 03:53:08 -07:00
kevinz000
a888c7c29a continue 2020-04-09 02:52:32 -07:00
kevinz000
a08536b0ff Merge pull request #11778 from kappa-sama/patch-17 
shamelessly nerfs purified claymore
 2020-04-09 02:41:40 -07:00
kevinz000
f60cf32562 Merge pull request #11775 from Trilbyspaceclone/frail-crafting 
Frail crafting - Glass work additions and changes!
 2020-04-09 02:41:01 -07:00
kevinz000
22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges 
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
 2020-04-09 02:38:44 -07:00