Commit Graph

24553 Commits

Author SHA1 Message Date
Ghom 501b4f0e3e Update watercloset.dm 2020-04-12 06:42:08 +02:00
kiwedespars 6f8992e712 Update haste.dm 2020-04-11 21:34:06 -07:00
Ghom fc58a34248 Merge pull request #11823 from Putnam3145/contam-buff
Bringing contamination back
2020-04-12 06:29:40 +02:00
Ghom f5852424e3 Merge pull request #11812 from Auris456852/master
Adds admin printer noise for Centcomm/Syndicate messages
2020-04-12 06:25:52 +02:00
Ghom 3f573fb611 Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
2020-04-12 06:24:57 +02:00
Ghom 28642ce39c Merge pull request #11816 from necromanceranne/broke_dodging
fixes rising bass and sleeping carp not dodging
2020-04-12 06:23:47 +02:00
Ghom a96f6238df Merge pull request #10891 from Trilbyspaceclone/more_crates+bags
[Ready]Better crate options
2020-04-12 05:48:20 +02:00
Ghom d693d3ef26 Merge pull request #11807 from Citadel-Station-13/kevinz000-patch-4
datum pipeline null gasmix stack trace now gives a REF()
2020-04-12 05:46:07 +02:00
Ghommie e6fbd0cced Whops 2020-04-12 05:13:43 +02:00
Ghommie fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
kevinz000 0ea1e557db ok 2020-04-11 19:31:19 -07:00
Ghommie 983f369357 Little Holodeck refactor. 2020-04-12 01:49:25 +02:00
Ghom 1babc75a69 Merge pull request #11818 from spookydonut/patch-1
Update spacemandmm to 1.4
2020-04-11 23:59:31 +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
Putnam c8ebc6411e Actually let's make it... differenter. 2020-04-11 12:58:43 -07:00
Putnam b5a150911c Massively buffs contamination numbers 2020-04-11 12:43:14 -07:00
Putnam a779ec2411 Makes contamination work (whoops) 2020-04-11 12:42:25 -07:00
spookydonut a6f6a27c87 Update code/modules/vending/_vending.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-04-12 00:53:57 +08:00
Ghom 848c1996e4 Merge pull request #11806 from Citadel-Station-13/kevinz000-patch-3-1
removes hotspot expose from skateboards
2020-04-11 18:31:26 +02:00
Ghom ae1785af70 Merge pull request #11802 from Akrilla/alien_attack
Fixes attack_alien damage
2020-04-11 18:31:07 +02:00
Ghom 11fa208838 Merge pull request #11800 from Akrilla/changling-readapt
Fixes up changling readapting
2020-04-11 18:30:49 +02:00
kevinz000 4e8f771e2c ] 2020-04-11 09:15:03 -07:00
kevinz000 238665f464 progress 2020-04-11 09:13:10 -07:00
kevinz000 c1f5ad310b wew 2020-04-11 09:01:51 -07:00
Ghommie 7615f63753 Oopsie 2020-04-11 17:43:09 +02: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
kevinz000 8132db65b1 interrupt funtion 2020-04-11 05:59:11 -07:00
kevinz000 f8a7a68ac3 lmao 2020-04-11 05:52:37 -07:00
kevinz000 65f61c968c k 2020-04-11 05:16:42 -07:00
kevinz000 76e93d504a this massive proc lmao 2020-04-11 05:15:50 -07:00
kevinz000 8a8cfbe54a fixes 2020-04-11 05:13:17 -07:00
kevinz000 41f359db83 fixes 2020-04-11 05:11:42 -07:00
kevinz000 234687c5c8 do_after_advanced 2020-04-11 05:10:07 -07:00
Ghom f9f1bbc05f Merge pull request #11804 from Akrilla/beepsky-tie
Fixes beepsky ziptie weirdness
2020-04-11 13:40:24 +02:00
kevinz000 99edc1e1a5 make it compile for blocking test 2020-04-11 03:40:52 -07:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
kevinz000 d44d5168d8 progress.. 2020-04-10 22:50:53 -07:00
kevinz000 f652a612e5 missing comma 2020-04-10 22:18:53 -07:00
Akrilla 8abc0cc0a7 !on 2020-04-11 05:24:24 +01: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