Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05: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
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03: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
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
kevinz000
|
e6f98fa270
|
compile
|
2020-04-09 09:16:46 -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 |
|
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
|
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
|
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 |
|