Commit Graph

5978 Commits

Author SHA1 Message Date
Winter Flare bb9066e9cb Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00
Ghommie ad4d290ea7 WIP 2020-03-08 19:26:01 +01:00
kevinz000 274b9c28b3 Merge pull request #11264 from Ghommie/Ghommie-cit592
fixing a couple silicon privileges runtimes. Also .dme alphabetic order
2020-03-08 11:10:30 -07:00
kevinz000 b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
2020-03-08 11:10:02 -07:00
kevinz000 5add119388 Merge pull request #11374 from Detective-Google/AI-cryo
Adds a verb for AIs to cryo
2020-03-08 11:09:48 -07:00
kevinz000 2b5f337f06 Merge pull request #11365 from Ghommie/Ghommie-cit607
Makes monkey probability of gorillize from radiation exponential.
2020-03-08 08:15:11 -07:00
Ghom 3c066aa771 Update pai_shell.dm 2020-03-08 15:46:38 +01:00
Ghom 7ad2c6dce0 Update pai.dm 2020-03-08 14:55:15 +01:00
Ghom 8f6677326d Update pai.dm 2020-03-08 14:51:41 +01:00
Ghom a0e5f1651e Update pai_shell.dm 2020-03-08 14:49:43 +01:00
Ghom 4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
Lin ea1bb1812c Merge pull request #11370 from Citadel-Station-13/Ghommie-patch-1
Me 2048
2020-03-08 01:26:39 -06:00
Ghommie 10c8dbbb6e hOLd oN 2020-03-08 02:47:38 +01:00
Ghommie 5bcb38c79f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit610 2020-03-08 02:33:27 +01:00
Ghom b96475d5aa Merge pull request #11346 from Citadel-Station-13/kevinz000-patch-15
/carbons now null out hand_bodyparts on Destroy()
2020-03-08 01:40:43 +01:00
Ghom 5f3496e908 Update human.dm 2020-03-08 01:27:35 +01:00
Ghommie 97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
kevinz000 7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
Ghom f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293
Makes two new legion drops
2020-03-07 11:39:51 +01:00
Ghom aed0efb117 Merge pull request #11343 from Citadel-Station-13/kevinz000-patch-7
mobs now clear LAssailent and movespeed modification on Destroy() (alt name i hate xenobiology)
2020-03-07 11:36:37 +01:00
Ghom fdf3dc82e4 Merge pull request #11347 from Citadel-Station-13/kevinz000-patch-17
Makes xenobiology powergamers slightly less horrible for the server by caching slime mutation lists
2020-03-07 11:36:06 +01:00
kevinz000 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
2020-03-07 03:26:48 -07:00
kevinz000 204311abad Update code/modules/mob/living/living.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-07 01:06:24 -07:00
Detective Google bb4b6f8c01 src.mind.assigned_role == "AI" 2020-03-07 00:06:17 -06:00
Detective Google c7eb8b430d adds the option for AIs to cryo without being dragged and stuffed in a pod on the other side of the station. 2020-03-06 23:22:41 -06:00
kappa-sama 1ca4eda4be it begins 2020-03-06 22:58:12 -05:00
monster860 c8535275ce In case it wasn't shitcode enough, makes it reset on move 2020-03-06 22:05:56 -05:00
Ghommie 7bed0d5c87 Of runtimes and null. 2020-03-07 01:57:15 +01:00
Ghom 137e3560c5 Me 2048 2020-03-07 00:57:25 +01:00
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
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 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 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 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
deathride58 e08669e8a1 Ports Virgo's synthetic taursprites, adds taur to synthliz mutant bodyparts 2020-03-06 00:15:37 -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
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
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