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

4179 Commits

Author SHA1 Message Date
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -07:00
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
Ghommie
5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000
b7c3ada3e5 nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438) 
* Update status_procs.dm

* Update status_procs.dm

* travis

* aight bet
 2020-03-15 13:08:52 +01:00
kevinz000
2de1395e6b Merge pull request #11471 from Citadel-Station-13/Ghommie-patch-1 
Webedit fixing electrocute_act stuns.
 2020-03-14 21:49:36 -07:00
Kraseo
bee11a2ee5 no i am not testing if mice can chew wires if they're in a stomach now shut the fuck up (#11460) 2020-03-15 04:04:35 +01:00
Ghom
06d641b46a Webedit fixing electrocute_act stuns. 2020-03-14 21:19:09 +01:00
kevinz000
0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke 
I'm pretty sure this was causing people to bleed out from light hits
 2020-03-14 09:11:38 -07:00
kevinz000
395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618 
Porting datum components system updates.
 2020-03-14 09:09:50 -07:00
necromanceranne
49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
Ghommie
da5b293033 underscores. 2020-03-12 21:31:17 +01:00
Ghommie
663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty 
miner powercreep starring 150 damage pointblank shotgun
 2020-03-11 17:27:22 -07:00
kevinz000
54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port 
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
 2020-03-11 17:26:33 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
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
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01: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
necromanceranne
f41f78b162 Massively refactors martial arts, ports New Sleeping Carp 2020-03-10 20:09:31 +11: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