shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,695 Commits 5 Branches 0 Tags
0d80c8c1699bbb41b42485f07d2cbed3f63d128f
Commit Graph

4144 Commits

Author SHA1 Message Date
kevinz000
3df171cf99 Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1 
Fixes mob spawners errors with posibrains.
 2020-03-11 17:00:46 -07:00
Ghom
3b102c4ef7 Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2 
legion swarming now only applies to legions, not all of everything else that is a supertype and subtype of /hivelordbrood
 2020-03-11 17:21:00 +01:00
Ghom
ed92d21a0e Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5 
Fixes posibrain/MMI mechs not getting any mobility flags
 2020-03-11 16:48:02 +01:00
kevinz000
2bf892c482 Update bubblegum.dm 2020-03-11 08:07:37 -07:00
kevinz000
bfeb2f0952 Update hivelord.dm 2020-03-11 08:07:20 -07:00
kevinz000
2552a34c21 Update hivelord.dm 2020-03-11 08:02:33 -07:00
kevinz000
ee68e71b2a Update bubblegum.dm 2020-03-11 08:01:34 -07:00
kevinz000
dbcb9fec6a Update code/modules/mob/living/brain/brain.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-11 07:56:26 -07:00
Ghom
f7674067d2 Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2 
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
 2020-03-11 13:17:47 +01:00
kevinz000
1ecb84526f Update brain.dm 2020-03-11 01:09:52 -07:00
kevinz000
d5ab355fe5 Update living.dm 2020-03-10 19:39:11 -07:00
kevinz000
46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604 
Made flavor texts into an element datum, appliable to every atom.
 2020-03-10 17:26:20 -07:00
kevinz000
fef4c82464 Update living.dm 2020-03-10 17:18:53 -07:00
kevinz000
c4f59b0b83 Update life.dm 2020-03-10 17:18:01 -07:00
kevinz000
09d39b8cbd Update robot.dm 2020-03-10 17:17:37 -07:00
kevinz000
bb1480a369 Update carbon.dm 2020-03-10 17:16:33 -07:00
kevinz000
f5fd4733e1 Merge pull request #11411 from Citadel-Station-13/Ghommie-patch-1 
Webedit touching the MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING speed modifier: Citadel Edition.
 2020-03-10 17:14:51 -07:00
Ghom
152b3b3b51 Update posibrain.dm 2020-03-10 18:20:07 +01:00
Ghom
48ff2f2cec Merge pull request #11349 from monster860/pixel_erp 
Pixel shifting for ERP
 2020-03-10 18:01:52 +01:00
Ghom
aaf494c66b Update code/modules/mob/mob_defines.dm 
Co-Authored-By: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-03-10 17:37:39 +01:00
Ghom
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
Ghom
c86124f8ed Update human.dm 2020-03-10 14:34:17 +01:00
kevinz000
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
kevinz000
41fdaae32c Merge pull request #11390 from zeroisthebiggay/ghosthudstaketwo 
makes ghost hud default to on and ghost darkness defaults to on
 2020-03-10 05:58:43 -07:00
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000
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
kevinz000
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
Ghom
80eaf3be0d Update _drone.dm 2020-03-09 22:22:38 +01:00
Ghom
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
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
keronshb
7e1e905a95 Line ending changes, I hope 
here goes nothing.
 2020-03-08 20:36:05 -04:00
keronshb
0d3da4fcc0 maybe? last go? 2 
Should be the final part I hope
 2020-03-08 20:11:13 -04:00
keronshb
94958581b9 maybe? last go? 
maybe? last go?
 2020-03-08 20:10:34 -04: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
Ghom
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
keronshb
d460f5359e Hopefully this will fix it? 
Hopefully this will fix it?
 2020-03-08 18:49:18 -04:00
keronshb
9b63c7aa11 Trying to see if this will fix the line end issue 
Trying to see if this will fix the line end issue
 2020-03-08 18:48:42 -04: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
ZeroMan
1941169582 will this fucking work 2020-03-08 15:45:35 -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
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