Commit Graph

15183 Commits

Author SHA1 Message Date
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
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 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 8132db65b1 interrupt funtion 2020-04-11 05:59:11 -07:00
kevinz000 f8a7a68ac3 lmao 2020-04-11 05:52:37 -07:00
kevinz000 76e93d504a this massive proc lmao 2020-04-11 05:15:50 -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
Akrilla 8abc0cc0a7 !on 2020-04-11 05:24:24 +01:00
Ghom cd2edb3cf1 dont need to null when qdeling later (#11797) 2020-04-11 01:59:46 +02:00
Ghom a75bd30911 Update carbon_defense.dm 2020-04-10 19:54:12 +02:00
Artur f481be1496 Makin stuff nice and dandy 2020-04-10 20:53:28 +03:00
Putnam3145 b939359e35 Made my choice thing actually... do something (#11787) 2020-04-10 18:16:19 +02:00
kevinz000 d5769a6ee4 Update carbon_defense.dm (#11738) 2020-04-10 18:13:50 +02:00
Ghommie af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
Arturlang b40fb55539 Fixes mesmerzie and makes it work better (#11785)
* Weh

* Mesmerize works a lot nicer now
2020-04-10 15:41:35 +02:00
kevinz000 d19dd8f2e1 fixes baystruments (#11790)
* fix

* sigh
2020-04-10 15:36:42 +02:00
kevinz000 185b38e109 Update scooter.dm 2020-04-10 04:33:35 -07:00
kevinz000 9d931c0a3a Update datum_pipeline.dm 2020-04-10 04:32:16 -07:00
kevinz000 b09ac26ab2 Update scooter.dm 2020-04-10 04:25:53 -07:00
Akrilla 2a05903808 do_after 2020-04-10 04:26:35 +01:00
Akrilla 5c74e239a0 wew 2020-04-10 03:43:18 +01:00
Timothy Teakettle ea8d43281e swap & for &&
woops

Co-Authored-By: Lin <linzolle@gmail.com>
2020-04-10 03:21:06 +01:00
Akrilla ec5db05bdc fixes up readapting 2020-04-10 03:18:13 +01:00
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05:00
Timothy Teakettle 4c4e110375 imagine making it compile 2020-04-09 20:16:55 +01:00
Timothy Teakettle 951732c361 make secret sauce work on customizables 2020-04-09 20:12:02 +01:00
Timothy Teakettle 1ffea14ee8 makes descriptions work 2020-04-09 19:53:14 +01:00
Artur fe755a1424 Tackling Working so far, working on the lunge now 2020-04-09 21:42:00 +03:00
Akrilla 87dce0c3e9 dont need to null when qdeling later 2020-04-09 18:41:39 +01:00
Timothy Teakettle cfec83b8a2 what if butchering didnt suck! 2020-04-09 18:38:29 +01:00
Trilbyspaceclone 9bf84aca32 grammar 2020-04-09 13:18:55 -04:00
Putnam3145 a203ef7de5 Merge pull request #11794 from Citadel-Station-13/kevinz000-patch-1
DefaultCombatKnockdown now respects CANKNOCKDOWN status flag
2020-04-09 10:07:25 -07:00