Commit Graph

16247 Commits

Author SHA1 Message Date
keronshb 228012c718 Blob refactor (#43872)
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
Ghom bc981bd637 Update hivelord.dm 2020-03-06 21:55:43 +01:00
Ghommie 079fd425e5 Makes the monkeys' gorillize chances from radiation exponential. 2020-03-06 19:05:45 +01:00
kevinz000 a669e87db1 Merge branch 'master' into gc_debugging 2020-03-06 10:14:19 -07:00
kevinz000 93d995eb18 k 2020-03-06 10:13:11 -07:00
Ragolution 1cc7d01a44 Culls irrelevant targeting information. 2020-03-06 11:39:27 -05:00
Ragolution 4857bd120c Fixes bartender drink slide spill
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
2020-03-06 10:06:59 -05:00
Ghom c6c676ceb5 Merge pull request #11298 from Kraseo/contracties
Ports TG's Syndicate Contractors
2020-03-06 15:23:30 +01:00
TrilbySpaceClone f1116648a8 corrects snowcones 2020-03-06 09:08:05 -05:00
Ghommie a298a34ae9 Oh yea. 2020-03-06 14:57:34 +01:00
Ghommie 5d6eb6f24b Patches some awful integrated circuit examiner runtime errors. 2020-03-06 14:56:49 +01:00
Ragolution 597e1210f3 fix quintuple sec mix_sound def
Fixes mix_sound for Quintuple Sec being assigned to mix_message. The fact that this was never reported before proves how infrequently people actually make quintuple sec.
2020-03-06 08:38:33 -05:00
kevinz000 5aacdded63 Update gloves.dm 2020-03-06 06:23:56 -07:00
kevinz000 2f83492451 Update ninjaDrainAct.dm 2020-03-06 06:23:13 -07:00
Ghom 4b3725bb43 Merge pull request #11348 from Citadel-Station-13/kevinz000-patch-19
fixes pool mist garbage collection
2020-03-06 14:20:58 +01:00
Ghom f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
2020-03-06 13:48:03 +01:00
kevinz000 0ace3f2310 Update buffing.dm 2020-03-06 05:42:28 -07:00
Trilbyspaceclone 178de5ee0d Merge branch 'master' into more_crates+bags 2020-03-06 06:31:54 -05:00
Kraseo ad20fb1a0e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-06 11:58:11 +01:00
monster860 4a108d7a9a fixes oopsie 2020-03-06 04:40:22 -05:00
monster860 86baaf3710 Pixel shifting for ERP 2020-03-06 04:31:46 -05:00
kevinz000 3af4862be6 Update pool_controller.dm 2020-03-06 02:09:39 -07:00
kevinz000 62d2acf94f Update slime.dm 2020-03-06 02:06:42 -07:00
kevinz000 87c869a735 Update carbon.dm 2020-03-06 02:00:19 -07:00
kevinz000 6db3a23828 Update belly_obj.dm 2020-03-06 01:44:45 -07:00
kevinz000 4d9c92c317 Update mob.dm 2020-03-06 01:39:16 -07:00
kevinz000 ae97cec8b4 Merge pull request #11309 from Citadel-Station-13/Ghommie-patch-1
The lavaland elite tumor shard revival now fetches the mob's ghost.
2020-03-06 00:20:18 -07:00
kevinz000 d376b99af6 Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
2020-03-06 00:19:51 -07:00
kevinz000 16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
kevinz000 23fa750e31 Merge pull request #11324 from Trilbyspaceclone/patch-302
Makes medical hardsuits have built in huds
2020-03-06 00:17:09 -07:00
kevinz000 78b1dcaae4 Merge pull request #11330 from Citadel-Station-13/Ghommie-patch-4
Allows blobbernauts to drag objects (but not mobs) again.
2020-03-06 00:14:43 -07:00
kevinz000 9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
deathride58 e08669e8a1 Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts 2020-03-06 00:15:37 -05:00
Ghom 5c67c71e90 Update towercap.dm 2020-03-06 05:41:49 +01:00
Ghom b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01:00
deathride58 ee65f070bf fixes runtime with body markings 2020-03-05 23:22:56 -05:00
Ghommie 0c4af362bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit605 2020-03-06 04:00:36 +01:00
Ghommie e484f72d7b Ports movespeed modifiers code updates. 2020-03-06 03:35:56 +01:00
Crystal9156 adc965d55e Fixes Chocolate Jelly Donuts
Choco Jelly Donuts's icon_state is actually jelly_choco, it /was/ jelly_choc which is incorrect as the dmi says jelly_choco
2020-03-05 20:52:09 -05:00
deathride58 2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghom 5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom 44a9add328 Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
Ghommie 324f75c4db Makes the thing actually work. 2020-03-05 21:41:41 +01:00
Ghommie 6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
Ghommie 2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
kevinz000 5bca5690c4 ok 2020-03-05 01:00:35 -07:00
kevinz000 e027d22fd8 eh ok 2020-03-05 00:53:18 -07:00
kevinz000 032b973d82 wow that's a lot of effort 2020-03-05 00:51:05 -07:00
kevinz000 76541ff57a getting worse 2020-03-05 00:16:22 -07:00
deathride58 c5109fa31a addresses review 2020-03-04 21:04:34 -05:00