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
779766d1f6
Merge pull request #11759 from Trilbyspaceclone/telecoms
...
Makes upgrading telecoms more usefull
2020-04-09 02:38:10 -07:00
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
956a85ab34
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
...
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
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
395d33e54c
Merge pull request #11766 from Ghommie/Ghommie-cit699
...
Bringing back accidentally reverted solar panel fixes.
2020-04-07 19:59:48 +00:00
3901049c0d
Update shields.dm
2020-04-07 12:50:01 -07:00
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
05582f567f
?
2020-04-07 09:11:20 -04:00
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
557df9f21a
Merge pull request #11755 from Trilbyspaceclone/patch-335
...
Corrects plastic knife damage
2020-04-07 02:00:35 -07:00
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
def93f14fb
Update watercloset.dm
2020-04-07 03:40:00 -04:00
a6e07e5427
Merge branch 'master' into found_and_hidden
2020-04-07 03:37:09 -04:00
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
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
a80e6712b9
Merge pull request #11749 from Putnam3145/organ-conveyance
...
Changed how scanners show organ damage.
2020-04-06 15:46:49 -07:00
f6db5764e3
Bringing back accidentally reverted solar panel fixes.
2020-04-06 18:20:34 +02:00
cb1e6b518d
forgot to save last commit that fixes this
2020-04-06 08:50:37 -04:00
2cd59a6fb0
that was easy
2020-04-06 08:40:34 -04:00
bfa83591df
what if we made upgrading them more usfull
2020-04-06 07:35:36 -04:00
2ba342aa1a
Update kitchen.dm
2020-04-05 23:11:25 -04:00
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
33a056b373
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:29:14 +10:00
adeb61180c
big floof
2020-04-06 01:09:25 +01:00
443af96126
Changed how scanners show organ damage.
2020-04-05 03:25:04 -07:00
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
...
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
09c8bd40ec
Merge pull request #11575 from EmeraldSundisk/coggers
...
as of yet unfinished, being added in the background for ease of further development
2020-04-04 13:18:07 -05:00
15d9c9f0ae
Revert "Revert "effort""
...
This reverts commit c3aaf27aa2
2020-04-04 11:01:21 -04:00
32b98cce44
rip funny commit
...
//We care about you Skyrats!
2020-04-04 10:38:11 -04:00
99bf1da408
your to you
2020-04-04 10:37:37 -04:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
c3aaf27aa2
Revert "effort"
...
This reverts commit 10ca01cc95
2020-04-04 10:23:14 -04:00
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
10ca01cc95
effort
2020-04-04 09:30:24 -04:00
e2d2f5a4ad
Update minesweeper.dm
2020-04-04 14:04:47 +02:00
3c9a9136b5
Update minesweeper.dm
2020-04-04 13:46:21 +02:00
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
...
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
57fe91fafb
Merge pull request #11596 from Feasel/patch-4
...
[Balance Pass] - Stunbaton (Because no one wants to do a single line …
2020-04-03 16:30:30 -07:00
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
598179553e
Changes making cablecuffs to using cable in your hand, instead of a menu. ( #11702 )
...
* There we go
* Ghommie suggestions
2020-04-03 18:34:26 +02:00
93feb0277a
Further dynamic tweaks: "you can instamerge this time" edition ( #11715 )
...
* Starting a replacement of how threat works.
* no, we do it this way
* Added threat levels to jobs
* Added threat to... a lot.
* Updated for traitor classes.
* Fixed errors, except for one.
It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.
* Added type annotation to GetJob.
* This one I should change though
* wow how'd that happen
* spammable means low threat
* Made story threat have initial threat level on average
* Made somet rulesets force if they won the vote
* )
* Gave EVERY job threat, added a config for it.
* Rebalanced some numbers
* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Removes mush threat
* Makes devil threat scale with form
* reviewing reviewer's review of reviewer
* Gutlunches can be friendly spawned, so no
* Also made forced-friendly mobs not count
* null checks better
* Made antag threats in config, too
* various fixes
* Another couple dynamic fixes
* Made an admin message chunk all one line.
* Make roundstarts ignore current threat
It's not even calculated yet, so this is probably better.
* Minimum pop for chaotic/teamwork.
* More conveyance issues, removed superfluous threat costs
* More conveyance and tweaks
* Makes storyteller min players use all players instead of ready
* Lowered chaos weight with chaotic
* Blob now has correct cost
* Makes phylactery count for threat
* Makes random storyteller have random threat level
* Made starting rulesets scale up with threat LEVEL
* Made "minor rulesets" never have lower weight
* Makes chaotic not forced.
* Made story about 25% less chaotic
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-03 14:23:08 +02:00
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
ede3379a87
Merge pull request #11719 from Ghommie/Ghommie-cit662
...
Intellectual property infringment is not cool.
2020-04-02 06:18:41 -07:00
e50fe8b061
Removing a trademark from the game.
2020-04-02 14:48:43 +02:00
736ef2cb7c
Merge pull request #11705 from Ghommie/Ghommie-cit659
...
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
kevinz000