shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,660 Commits 5 Branches 0 Tags
1033421fd2b0cc4c59fdd4a491490bc409616d21
Commit Graph
34660 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 1033421fd2 Automatic changelog generation for PR #12583 [ci skip] 2020-06-22 20:20:49 -05:00
GhomandGitHub c16381b570 Merge pull request #12583 from Detective-Google/eyepatch 
fixes one of the icon states for the diagnostic hud eyepatch
 2020-06-23 03:20:46 +02:00
Detective Google 09051189a3 fixes one of the icon states for the diagnostic hud eyepatch 2020-06-22 18:37:28 -05:00
LinandGitHub a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5 
Slime color changing now has 65536 possible colors instead of 256
 2020-06-21 19:37:54 -05:00
Changelogs dc75f56378 Automatic changelog compile [ci skip] 2020-06-22 00:08:41 +00:00
CitadelStationBot 2920a89791 Automatic changelog generation for PR #12557 [ci skip] 2020-06-21 18:33:02 -05:00
LinandGitHub 2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
CitadelStationBot 80ec5b12f8 Automatic changelog generation for PR #12561 [ci skip] 2020-06-21 16:11:13 -05:00
siliconsandGitHub 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
CitadelStationBot 94cfb4ba22 Automatic changelog generation for PR #12488 [ci skip] 2020-06-21 16:10:49 -05:00
siliconsandGitHub 8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813 
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
 2020-06-21 14:10:45 -07:00
siliconsandGitHub 753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald 
Ports the reworked snowcabin and beach away missions
 2020-06-21 14:10:29 -07:00
Changelogs 36c46c3c4c Automatic changelog compile [ci skip] 2020-06-21 00:08:22 +00:00
shellspeed1 06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
CitadelStationBot 33cae67acf Automatic changelog generation for PR #12558 [ci skip] 2020-06-20 18:44:21 -05:00
LinandGitHub 905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4 
Drastically buffs punch hit chance
 2020-06-20 18:44:17 -05:00
Detective Google 4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
kevinz000andGitHub 354cc7d0c7 Update jellypeople.dm 2020-06-19 19:31:38 -07:00
Changelogs 2e8a2fee66 Automatic changelog compile [ci skip] 2020-06-20 00:07:58 +00:00
Ghommie 48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000andGitHub 6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818 
Fixing some runtimes issues and warnings bout rnd.
 2020-06-19 14:22:40 -07:00
CitadelStationBot d805ba3d9b Automatic changelog generation for PR #12414 [ci skip] 2020-06-19 16:09:13 -05:00
GhomandGitHub e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing 
asset cache + better minimaps
 2020-06-19 23:09:09 +02:00
CitadelStationBot ca7f452a7f Automatic changelog generation for PR #12542 [ci skip] 2020-06-19 16:07:26 -05:00
GhomandGitHub dd009ada48 Merge pull request #12542 from bunny232/scrubber 
Removes lewd events from the vent clog event
 2020-06-19 23:07:23 +02:00
Ghommie 43acf79dd3 oh wow 2020-06-19 21:55:01 +02:00
Ghommie 162549a3c2 Fixing stuff. 2020-06-19 20:34:51 +02:00
shellspeed1 9197cb4813 allows storage in medbelts and organ boxes. 2020-06-18 21:06:22 -07:00
Changelogs 915b147367 Automatic changelog compile [ci skip] 2020-06-19 00:07:42 +00:00
LinandGitHub 8303de3c00 Merge pull request #12564 from kevinz000/sigh 
fixes sutures and mesh being invisible hey speedmerge this
 2020-06-18 17:10:19 -05:00
kevinz000 c7e42c8d88 groan 2020-06-18 14:31:34 -07:00
CitadelStationBot f60f9555ee Automatic changelog generation for PR #12487 [ci skip] 2020-06-18 13:37:14 -05:00
LinandGitHub 3cdc73ff35 Merge pull request #12487 from kevinz000/erp_2 
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
 2020-06-18 13:37:10 -05:00
LinandGitHub 7d30d7c7ff Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1 
maybe fixes conveyors being a crash vector
 2020-06-18 13:34:31 -05:00
nik707andGitHub 1f53cd34d3 Merge pull request #12563 from kevinz000/shuttles 
fixes master (shuttles not loading)
 2020-06-18 10:41:20 -05:00
nik707andGitHub 828f6686cf Merge pull request #12553 from Citadel-Station-13/kevinz000-patch-3 
fixes dd.log
 2020-06-18 10:40:47 -05:00
kevinz000andGitHub 8a90590263 Update species.dm 2020-06-18 08:25:49 -07:00
CitadelStationBot 407ed71d38 Automatic changelog generation for PR #12560 [ci skip] 2020-06-18 10:24:59 -05:00
kevinz000andGitHub e381f7060e Merge pull request #12560 from SmArtKar/runtime_fixes 
Runtime Fixes
 2020-06-18 08:24:57 -07:00
kevinz000andGitHub c655a0451c Update shuttle.dm 2020-06-18 08:24:51 -07:00
kevinz000 1b5ea90c8f sigh 2020-06-18 08:16:05 -07:00
shellspeed1 1e99990b38 Revert "Automatic changelog compile [ci skip]" 
This reverts commit aa28d1dd5d.
 2020-06-18 02:45:44 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG 
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
 2020-06-18 02:30:58 -07:00
SmArtKar 17c38efbb0 Runtime Fixes 2020-06-18 11:24:08 +03:00
kevinz000andGitHub 291004d0fb Update species.dm 2020-06-17 22:44:08 -07:00
kevinz000 78fadafa05 alright 2020-06-17 21:44:49 -07:00
kevinz000 409dbd2835 carbons and humans 2020-06-17 21:42:04 -07:00
kevinz000 1336404eb6 last ones 2020-06-17 21:37:19 -07:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00