 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 |
|
|
Artur
|
fe755a1424
|
Tackling Working so far, working on the lunge now
|
2020-04-09 21:42:00 +03: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 |
|
|
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 |
|
|
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
|
d6c819cad2
|
Update lootdrop.dm
|
2020-04-07 09:20:18 -04:00 |
|
|
TrilbySpaceClone
|
05582f567f
|
?
|
2020-04-07 09:11:20 -04:00 |
|
|
TrilbySpaceClone
|
1f51e73dd6
|
more rng
|
2020-04-07 08:43:18 -04: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 |
|
|
kevinz000
|
0d0ee1cd46
|
Merge remote-tracking branch 'citadel/master' into storage_rework
|
2020-04-06 18:40:58 -07:00 |
|
|
kevinz000
|
154e145e25
|
storage
|
2020-04-06 18:40:20 -07:00 |
|
|
kevinz000
|
a53096bdbf
|
Merge pull request #11745 from Trilbyspaceclone/hide_and_seak
Atomic PR 1 or 2 - Toilet Loot!
|
2020-04-06 15:47:39 -07:00 |
|
|
kevinz000
|
a80e6712b9
|
Merge pull request #11749 from Putnam3145/organ-conveyance
Changed how scanners show organ damage.
|
2020-04-06 15:46:49 -07:00 |
|
|
Ghommie
|
f6db5764e3
|
Bringing back accidentally reverted solar panel fixes.
|
2020-04-06 18:20:34 +02:00 |
|
|
Trilbyspaceclone
|
cb1e6b518d
|
forgot to save last commit that fixes this
|
2020-04-06 08:50:37 -04:00 |
|
|
TrilbySpaceClone
|
2cd59a6fb0
|
that was easy
|
2020-04-06 08:40:34 -04:00 |
|
|
Artur
|
c402c6dc30
|
Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/
|
2020-04-06 13:24:52 +03:00 |
|
|
Trilbyspaceclone
|
2ba342aa1a
|
Update kitchen.dm
|
2020-04-05 23:11:25 -04:00 |
|
|
KathrinBailey
|
adeb61180c
|
big floof
|
2020-04-06 01:09:25 +01:00 |
|
|
Artur
|
f26f0c2555
|
Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix
|
2020-04-05 18:21:50 +03:00 |
|
|
Putnam
|
443af96126
|
Changed how scanners show organ damage.
|
2020-04-05 03:25:04 -07:00 |
|