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
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
287fbba4b8
Merge pull request #11758 from Putnam3145/add-ai-facing-message
...
[s] Adds a message to AIs when they encounter a certain bug.
2020-04-06 16:03:56 -07: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
ef0b81eabf
Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4
...
Fixed the epic nuke exploit
2020-04-06 15:48:02 -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
d89170e441
Merge pull request #11748 from Trilbyspaceclone/patch-334
...
Infested plasmamen now are miner type
2020-04-06 15:47:00 -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
699f891166
Merge pull request #11750 from Putnam3145/pluoxium
...
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
2020-04-06 15:46:09 -07:00
faf199fc35
Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking ( #11747 )
...
* Update security.dm
* Update civilian_service.dm
* why is their so many more lines of the same code here?
* Update rnd.dm
* clears up sec file so that they all use a base
* Update curator.dm
2020-04-06 17:53:43 +02:00
5f71efe07a
Adds a message to the AI to reconnect, since this is a common bug
2020-04-05 22:41:50 -07:00
33fc3ce1e0
Update spell.dm
2020-04-06 07:05:33 +02:00
5108bf1fc3
Stuff about power ( #11664 )
...
* Overhauled how APCs work, I guess
* Makes cells drain like before
2020-04-06 04:26:14 +02:00
443af96126
Changed how scanners show organ damage.
2020-04-05 03:25:04 -07:00
31f4269515
Makes miasma generate correctly, reverts previous pluox change.
2020-04-05 03:23:58 -07:00
7ed168da7f
Update hivelord.dm
2020-04-05 03:05:41 -04:00
1bf37dfb1b
Doubles pluoxium specific heat
2020-04-04 22:04:37 -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
ed52038dda
Merge pull request #11703 from Kraseo/public-tyranny
...
Removes public mining from the game
2020-04-04 07:39:13 -07: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
09a5e234d3
Merge pull request #11716 from kiwedespars/lightpink-nerf
...
stabilized lightpink nerf - stabilized purple buff
2020-04-04 07:22:47 -07:00
62509ab4a9
the mapping side
2020-04-04 10:16:43 -04:00
adad236997
Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1
...
What was I hoping for again?
2020-04-04 07:16:20 -07:00
2a2234483f
Merge pull request #11727 from Putnam3145/vore-pacifist-fix
...
Makes pacifists able to vore properly
2020-04-04 07:15:54 -07:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
886f0d7500
Merge pull request #11726 from Ghommie/Ghommie-cit665
...
Dwarfy message spam QoL.
2020-04-04 07:11:02 -07:00
9a0f0cab65
Merge pull request #11724 from Ghommie/Ghommie-cit664
...
Stops one of the many monkey tricks with mob holders.
2020-04-04 07:10:24 -07:00
10ca01cc95
effort
2020-04-04 09:30:24 -04:00
cefd212a50
I hecc'd ( #11739 )
2020-04-04 14:59:10 +02:00
e2d2f5a4ad
Update minesweeper.dm
2020-04-04 14:04:47 +02:00
dc6eb8b6c7
Badcode Mini Nukes Fix.
2020-04-04 13:58:48 +02:00
3c9a9136b5
Update minesweeper.dm
2020-04-04 13:46:21 +02:00
1987cc56a2
Merge pull request #11712 from Ghommie/Ghommie-cit661
...
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-03 21:58:58 -07:00
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
...
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
e8c33c411f
Merge pull request #11723 from Ghommie/Ghommie-cit663
...
Fixing three runtime errors.
2020-04-04 02:53:18 +00:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
...
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -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
a9ea7be699
Update dwarves.dm
2020-04-03 18:21:38 +02:00
1b8b3f28c3
Update reagent_dispenser.dm
2020-04-03 18:18:12 +02:00
150c0769ad
Update reagent_dispenser.dm
2020-04-03 15:54:48 +02:00
50ec842752
Update reagent_dispenser.dm
2020-04-03 15:53:09 +02:00
TrilbySpaceClone