5768 Commits
Author SHA1 Message Date
GhomandGitHub 48ff2f2cec Merge pull request #11349 from monster860/pixel_erp
Pixel shifting for ERP
2020-03-10 18:01:52 +01:00
GhomandGitHub 424a3d9668 Merge pull request #11399 from Seris02/lizardtailfixes
normalising wagging tail names for a very specific bug fix
2020-03-10 16:59:55 +01:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
GhomandGitHub c86124f8ed Update human.dm 2020-03-10 14:34:17 +01:00
kevinz000andGitHub 832d894e92 Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
kevinz000andGitHub e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000andGitHub bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
necromanceranne f41f78b162 Massively refactors martial arts, ports New Sleeping Carp 2020-03-10 20:09:31 +11:00
kevinz000andGitHub bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614
Porting more legcuffs / bola fixes etcetera
2020-03-09 21:01:51 -07:00
Ghommie 17007182c9 Merge branch 'Ghommie-cit604' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit604 2020-03-09 22:42:31 +01:00
GhomandGitHub 80eaf3be0d Update _drone.dm 2020-03-09 22:22:38 +01:00
GhomandGitHub 0400fbf8a2 Update constructs.dm 2020-03-09 22:21:32 +01:00
Ghommie 0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02 68382d65c8 normalising wagging tail names 2020-03-09 17:48:12 +08:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb fd1dc991ce Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
Pne more test go
2020-03-08 19:48:30 -04:00
GhomandGitHub 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb 0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
To fixs something?
2020-03-08 17:51:17 -04:00
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
kevinz000andGitHub 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
kevinz000andGitHub b2235e03a7 Merge pull request #11372 from Ghommie/Ghommie-cit610
Of runtimes and null.
2020-03-08 11:10:02 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 3c066aa771 Update pai_shell.dm 2020-03-08 15:46:38 +01:00
GhomandGitHub 7ad2c6dce0 Update pai.dm 2020-03-08 14:55:15 +01:00
GhomandGitHub 8f6677326d Update pai.dm 2020-03-08 14:51:41 +01:00
GhomandGitHub a0e5f1651e Update pai_shell.dm 2020-03-08 14:49:43 +01:00
GhomandGitHub 4a61dc7b72 tgstation PR #48189 by Yenwodyah 2020-03-08 14:10:34 +01:00
LinandGitHub 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
GhomandGitHub 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
GhomandGitHub 5f3496e908 Update human.dm 2020-03-08 01:27:35 +01:00
Ghommie 97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
kevinz000andGitHub 7115c96f9d Merge branch 'master' into gc_debugging 2020-03-07 15:30:47 -08:00
GhomandGitHub f35dfeb472 Merge pull request #11193 from Trilbyspaceclone/patch-293
Makes two new legion drops
2020-03-07 11:39:51 +01:00
GhomandGitHub 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
kevinz000andGitHub 02a488f507 Merge pull request #11340 from Ghommie/Ghommie-cit605
Porting movespeed modifiers code updates.
2020-03-07 03:26:48 -07:00
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
GhomandGitHub 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