shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,837 Commits 5 Branches 0 Tags
d6544af1446e743eba7b1ca066a524724cdfe621
Commit Graph

7591 Commits

Author SHA1 Message Date
kevinz000
e962afedfa Merge pull request #11825 from Ghommie/Ghommie-cit674 
Little Holodeck refactor.
 2020-04-12 17:03:11 -07:00
kevinz000
80de717dc8 Merge pull request #11824 from Ghommie/Ghommie-cit673 
Fixes occasional tunnel hole in the space hermit ruin.
 2020-04-12 17:02:52 -07: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
Ghom
d0af60a2d3 Merge pull request #11817 from Putnam3145/dynamic-lings-2 
More dynamic tweaks + dynamic latejoin changelings
 2020-04-13 01:48:12 +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
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
Ghom
f5852424e3 Merge pull request #11812 from Auris456852/master 
Adds admin printer noise for Centcomm/Syndicate messages
 2020-04-12 06:25:52 +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
Ghommie
983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghommie
a141c56b00 Not-so-airless turfs. 2020-04-11 23:43:01 +02:00
Ghommie
ab3ed7f9c2 Space Hermit Ruin fixes. 2020-04-11 23:27:19 +02:00
Ghommie
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Putnam
d65bda97c4 Fixing average threat weight calc 2020-04-10 20:14:54 -07:00
Putnam
093d2fdeb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-lings-2 2020-04-10 20:12:35 -07:00
Putnam
f6e3a20f85 More tweaks 2020-04-10 20:12:15 -07:00
Putnam
7d043289e8 Tweaks 2020-04-10 17:13:41 -07:00
Akrilla
747be9cbe4 Better random plush spawning (#11792) 
* better spawning

* check list size

* changes
 2020-04-11 01:59:29 +02:00
Auris456852
03f583e5ff Adds admin printer noise for Centcomm/Syndicate messages 2020-04-10 18:50:52 +03: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
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
Putnam3145
5078b5875a Fixes my oldish badcode. (#11781) 2020-04-09 14:48:58 +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
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
ba4585951e Merge pull request #11765 from Putnam3145/dynamic-chaos-weight 
Makes intrigue, classic, story storytellers have their chaos weighted by recent round chaos
 2020-04-09 02:40:25 -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
kevinz000
779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms 
Makes upgrading telecoms more usefull
 2020-04-09 02:38:10 -07:00
kevinz000
b8548f521b Merge pull request #11746 from Trilbyspaceclone/found_and_hidden 
Atomic PR 1 or 2 - Toilet Mapping!
 2020-04-09 02:11:43 -07:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
Artur
5fbe05f3c9 Cleaning up and finishing up 2020-04-08 18:16:10 +03:00
kappa-sama
a60257b0e2 o7 2020-04-08 00:05:32 -04:00
TrilbySpaceClone
b350436fbc working 2020-04-07 18:31:23 -04:00
TrilbySpaceClone
e9d2e798a3 more glasswork 2020-04-07 17:58:23 -04:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
Lin
395d33e54c Merge pull request #11766 from Ghommie/Ghommie-cit699 
Bringing back accidentally reverted solar panel fixes.
 2020-04-07 19:59:48 +00:00
kevinz000
3901049c0d Update shields.dm 2020-04-07 12:50:01 -07:00
kevinz000
8b2132317b Ports a rewritten version of BAYSTRUMENTS (#11680) 
* bay instruments

* k

* AAA

* remove that

* changes

* Update _instrument_key.dm

* safety nets

* @ghommie fixed

* volume

* Update item.dm

* Update item.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-07 15:21:50 +02:00
TrilbySpaceClone
05582f567f ? 2020-04-07 09:11:20 -04:00
Putnam
28f77af42e wow that's important 2020-04-07 05:50:00 -07:00
TrilbySpaceClone
3907a3739c Merge branch 'found_and_hidden' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into found_and_hidden 2020-04-07 07:35:31 -04:00
kevinz000
557df9f21a Merge pull request #11755 from Trilbyspaceclone/patch-335 
Corrects plastic knife damage
 2020-04-07 02:00:35 -07:00
kevinz000
ef2eaf2233 Merge pull request #11753 from KathrinBailey/Small-&-Snug-Changes 
They put me in a padded cell for spriting and porting.
 2020-04-07 01:56:21 -07:00
Trilbyspaceclone
def93f14fb Update watercloset.dm 2020-04-07 03:40:00 -04:00
Trilbyspaceclone
a6e07e5427 Merge branch 'master' into found_and_hidden 2020-04-07 03:37:09 -04:00
Putnam
43169aa9d4 Made teamwork also use recent weight. 2020-04-06 23:53:59 -07:00
Putnam
bf8b4134b7 Added latejoin changelings. 2020-04-06 23:01:19 -07:00
kevinz000
ec237331a4 Merge pull request #11743 from Citadel-Station-13/Ghommie-patch-2-1 
Lil minesweeper edge case.
 2020-04-06 15:48:50 -07:00