shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,762 Commits 5 Branches 0 Tags
0b6c5b7960e31187774f5b2e603e88d9257cf337
Commit Graph
31762 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub 0b6c5b7960 Update twohanded.dm 2020-03-11 18:19:09 -07:00
GhomandGitHub 88bdc6d068 Merge pull request #11440 from kevinz000/master_fix 
fixes master
 2020-03-12 01:54:15 +01:00
GhomandGitHub dbc54ab699 Update actions.dm 2020-03-12 01:47:51 +01:00
kevinz000andGitHub fa160d4c3a Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3 
Fixes flavor text preview on the chatbox.
 2020-03-11 17:44:35 -07:00
CitadelStationBot 9533747d36 Automatic changelog generation for PR #11307 [ci skip] 2020-03-11 19:43:25 -05:00
kevinz000andGitHub db188f8681 Merge pull request #11307 from kappa-sama/patch-17 
gets rid of fly species requirement from hulk
 2020-03-11 17:43:23 -07:00
kevinz000 6127f6a453 k 2020-03-11 17:41:12 -07:00
CitadelStationBot 165f9faf2c Automatic changelog generation for PR #11373 [ci skip] 2020-03-11 19:27:25 -05:00
kevinz000andGitHub 3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty 
miner powercreep starring 150 damage pointblank shotgun
 2020-03-11 17:27:22 -07:00
CitadelStationBot 77c8b789a5 Automatic changelog generation for PR #11408 [ci skip] 2020-03-11 19:26:36 -05:00
kevinz000andGitHub 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
kappa-samaandGitHub 80b17cff1f Merge branch 'master' into patch-17 2020-03-11 20:26:13 -04:00
CitadelStationBot 0e1490791c Automatic changelog generation for PR #11424 [ci skip] 2020-03-11 19:24:05 -05:00
kevinz000andGitHub b8642c5622 Merge pull request #11424 from necromanceranne/death_coma_stuff 
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
 2020-03-11 17:24:03 -07:00
CitadelStationBot fa1aea4ab5 Automatic changelog generation for PR #10327 [ci skip] 2020-03-11 19:01:40 -05:00
kevinz000andGitHub 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Putnam3145andGitHub 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
kevinz000andGitHub 0d80c8c169 Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2 
RCL inhands wires fix.
 2020-03-11 17:01:01 -07:00
CitadelStationBot e76704bfa3 Automatic changelog generation for PR #11414 [ci skip] 2020-03-11 19:00:49 -05:00
kevinz000andGitHub 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
CitadelStationBot b311b62919 Automatic changelog generation for PR #11409 [ci skip] 2020-03-11 18:30:55 -05:00
GhomandGitHub 9f681e9a76 Merge pull request #11409 from necromanceranne/taser_nerf 
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
 2020-03-12 00:30:52 +01:00
CitadelStationBot d30ba9721c Automatic changelog generation for PR #11410 [ci skip] 2020-03-11 18:28:06 -05:00
GhomandGitHub 199272ca9d Merge pull request #11410 from necromanceranne/harvesters_and_mechs 
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
 2020-03-12 00:28:03 +01:00
GhomandGitHub e41e3a5fbb Update banana.dm 2020-03-12 00:22:53 +01:00
CitadelStationBot 5c4663d364 Automatic changelog generation for PR #11432 [ci skip] 2020-03-11 11:21:03 -05:00
GhomandGitHub 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
GhomandGitHub 77bdb9afe8 Update flavor_text.dm 2020-03-11 17:15:04 +01:00
GhomandGitHub 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
kevinz000andGitHub 2bf892c482 Update bubblegum.dm 2020-03-11 08:07:37 -07:00
kevinz000andGitHub bfeb2f0952 Update hivelord.dm 2020-03-11 08:07:20 -07:00
kevinz000andGitHub 2552a34c21 Update hivelord.dm 2020-03-11 08:02:33 -07:00
kevinz000andGitHub ee68e71b2a Update bubblegum.dm 2020-03-11 08:01:34 -07:00
kevinz000GitHubGhom
 		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
CitadelStationBot 9a42101b68 Automatic changelog generation for PR #11421 [ci skip] 2020-03-11 07:17:51 -05:00
GhomandGitHub 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
GhomandGitHub 901fd6b96b Merge pull request #11420 from kappa-sama/patch-18 
removes limbo courtesy of bhijn
 2020-03-11 13:17:08 +01:00
CitadelStationBot a4855d3b18 Automatic changelog generation for PR #11385 [ci skip] 2020-03-11 07:10:27 -05:00
GhomandGitHub 5424633945 Merge pull request #11385 from bunny232/master 
Box theatre starboard vent/scrubber fix
 2020-03-11 13:10:24 +01:00
bunny232 7fe564e192 Update BoxStation.dmm 2020-03-11 06:56:17 -04:00
bunny232andGitHub d5f15874c2 Merge pull request #2 from Citadel-Station-13/master 
update 2
 2020-03-11 06:52:01 -04:00
kevinz000andGitHub 1ecb84526f Update brain.dm 2020-03-11 01:09:52 -07:00
necromanceranne c37d30a617 Some fixes requested by kev also ports a fix from tg 2020-03-11 15:43:47 +11:00
necromanceranne e3f6f07e73 some adjustments for now 2020-03-11 15:26:21 +11:00
kevinz000andGitHub d5ab355fe5 Update living.dm 2020-03-10 19:39:11 -07:00
kevinz000andGitHub 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
CitadelStationBot 2fabc0c7b5 Automatic changelog generation for PR #10702 [ci skip] 2020-03-10 19:24:51 -05:00
kevinz000andGitHub 0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528 
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
 2020-03-10 17:24:48 -07:00
kevinz000andGitHub fef4c82464 Update living.dm 2020-03-10 17:18:53 -07:00
kevinz000andGitHub c4f59b0b83 Update life.dm 2020-03-10 17:18:01 -07:00