Putnam3145
dad6ddb042
Merge pull request #11764 from Ghommie/Ghommie-cit668
...
Fixing spellcasting and edge cases.
2020-04-07 02:50:24 -07:00
Putnam3145
536934d1e2
Merge pull request #11770 from Kraseo/i-hate-slimes
...
The contractor pod now gives regen jelly instead of omnizine
2020-04-07 02:43:33 -07:00
kevinz000
029f8ff698
Merge pull request #11763 from necromanceranne/popcap_time
...
Pop caps Sleeping Carp and Rising Bass to 30 players.
2020-04-07 01:58:14 -07:00
necromanceranne
b494aa3370
Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now
2020-04-07 17:51:25 +10:00
timothyteakettle
c28aa08c71
woops i didnt add it to the seed
2020-04-07 00:16:28 +01:00
Kraseo
f88d36addf
quirky ass slime roundstart races
2020-04-07 01:12:21 +02:00
timothyteakettle
1b940a5464
space tobacco now has gaseous
2020-04-07 00:01:27 +01:00
timothyteakettle
378e188b3b
goodbye slip prickles
2020-04-06 23:57:00 +01:00
kevinz000
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
kevinz000
d89170e441
Merge pull request #11748 from Trilbyspaceclone/patch-334
...
Infested plasmamen now are miner type
2020-04-06 15:47:00 -07:00
kevinz000
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
Ghommie
f6db5764e3
Bringing back accidentally reverted solar panel fixes.
2020-04-06 18:20:34 +02:00
Trilbyspaceclone
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
Ghommie
b92da66f04
Fixing spellcasting and edge cases.
2020-04-06 17:32:51 +02:00
necromanceranne
eece94caf3
puts a pop cap on the various martial arts.
2020-04-07 00:28:09 +10: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
Ghom
33fc3ce1e0
Update spell.dm
2020-04-06 07:05:33 +02:00
necromanceranne
35f96a1c24
Merge branch 'pawnch_2_the_pawnchening' of https://github.com/necromanceranne/Citadel-Station-13 into pawnch_2_the_pawnchening
2020-04-06 13:42:40 +10:00
necromanceranne
1c50192c12
further fixing stuff
2020-04-06 13:42:23 +10:00
necromanceranne
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
necromanceranne
33a056b373
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:29:14 +10:00
necromanceranne
a6bd6d23fe
Some cleanup with help from rohesie, hopefully I figured it out
2020-04-06 12:28:14 +10:00
Putnam3145
5108bf1fc3
Stuff about power ( #11664 )
...
* Overhauled how APCs work, I guess
* Makes cells drain like before
2020-04-06 04:26:14 +02: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
31f4269515
Makes miasma generate correctly, reverts previous pluox change.
2020-04-05 03:23:58 -07:00
Trilbyspaceclone
7ed168da7f
Update hivelord.dm
2020-04-05 03:05:41 -04:00
Putnam
1bf37dfb1b
Doubles pluoxium specific heat
2020-04-04 22:04:37 -07:00
kevinz000
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
...
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
nik707
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
kevinz000
ed52038dda
Merge pull request #11703 from Kraseo/public-tyranny
...
Removes public mining from the game
2020-04-04 07:39:13 -07:00
Kraseo
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
kevinz000
09a5e234d3
Merge pull request #11716 from kiwedespars/lightpink-nerf
...
stabilized lightpink nerf - stabilized purple buff
2020-04-04 07:22:47 -07:00
kevinz000
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
kevinz000
2a2234483f
Merge pull request #11727 from Putnam3145/vore-pacifist-fix
...
Makes pacifists able to vore properly
2020-04-04 07:15:54 -07:00
kevinz000
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
kevinz000
886f0d7500
Merge pull request #11726 from Ghommie/Ghommie-cit665
...
Dwarfy message spam QoL.
2020-04-04 07:11:02 -07:00
Ghom
dc6eb8b6c7
Badcode Mini Nukes Fix.
2020-04-04 13:58:48 +02:00
necromanceranne
38586c9d92
I feel like this is more fitting
2020-04-04 20:09:09 +11:00
Trilbyspaceclone
31c7d70eb1
words are hard
2020-04-04 04:32:59 -04:00
necromanceranne
4c051f70e8
fixes this too
2020-04-04 19:16:59 +11:00
necromanceranne
bd5446e906
NYOOPS
2020-04-04 18:21:18 +11:00
necromanceranne
fcb816675b
not only am I blind I am also dumb
2020-04-04 18:20:17 +11:00
necromanceranne
7935eb8364
pretty sure this was brekaing stuff
2020-04-04 17:24:44 +11:00
necromanceranne
c6e82382a3
I feel like messing with this is basically unnecessary
2020-04-04 16:51:32 +11:00
necromanceranne
8af29a178c
Hooks up the chaplain null rod gloves to the choice of gloves
2020-04-04 16:42:37 +11:00
necromanceranne
71e19aead2
ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye
2020-04-04 16:29:29 +11:00
kevinz000
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
kevinz000
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
...
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
Trilbyspaceclone
48f458cddb
Update uplink_devices.dm
2020-04-04 00:09:02 -04:00
