 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 |
|
|
kevinz000
|
238665f464
|
progress
|
2020-04-11 09:13:10 -07: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Artur
|
5fbe05f3c9
|
Cleaning up and finishing up
|
2020-04-08 18:16:10 +03:00 |
|
|
kevinz000
|
3c4c397c46
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-04-08 04:04:45 -07: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 |
|
|
Putnam
|
28f77af42e
|
wow that's important
|
2020-04-07 05:50:00 -07:00 |
|