Commit Graph
473 Commits
Author SHA1 Message Date
zeskorionandGitHub 36ceb0b7f9 Update braindamage.dm 2020-01-09 21:59:57 -08:00
zeskorionandGitHub f7cf9c86bd Update death.dm 2020-01-09 21:57:37 -08:00
zeskorionandGitHub 5086b5dd94 Update unsorted.dm 2020-01-09 21:49:28 -08:00
zeskorionandGitHub e4cd4072cb Update braindamage.dm 2020-01-09 21:47:02 -08:00
zeskorionandGitHub 30b6206351 Update death.dm 2020-01-09 21:41:36 -08:00
zeskorionandGitHub 24b62dd010 Update traits.dm 2020-01-09 21:37:02 -08:00
zeskorionandGitHub be53f7fcc4 Update tgstation.dme 2020-01-09 21:29:54 -08:00
zeskorionandGitHub 197a4d870f Add files via upload 2020-01-09 21:25:08 -08:00
zeskorionandGitHub 86691eee19 Update tgstation.dme 2020-01-09 21:17:16 -08:00
zeskorionandGitHub 52afe3d2a8 Add files via upload 2020-01-09 21:05:38 -08:00
zeskorionandGitHub 2104ba551b Update symptoms.dm 2020-01-09 21:02:34 -08:00
zeskorionandGitHub 9573acc2ca Add files via upload 2020-01-09 21:01:10 -08:00
zeskorionandGitHub 5aafcf9569 Update death.dm 2020-01-09 20:59:51 -08:00
quotefox e64000354d Old mulitool and fix for health scanner 2020-01-04 01:00:02 +00:00
quotefox 411d23c1ef security fix 2020-01-04 00:50:52 +00:00
quotefox 7de4ab8475 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 2020-01-04 00:50:04 +00:00
quotefoxandGitHub add84628e4 Merge pull request #149 from Karamitsuko/master
Changes Centcom Uniforms
2020-01-04 00:49:44 +00:00
quotefoxandGitHub bb9e6680e4 Merge pull request #148 from Investigator77/master
The Device Update
2020-01-04 00:48:58 +00:00
quotefox 375bfcb76e Revert "Merge pull request #138 from Code-Cygnet/master"
This reverts commit 30ed0ecef2, reversing
changes made to 11b772557b.
2020-01-03 23:55:28 +00:00
Karamitsuko 3449e430cc Changes Centcom Uniforms 2020-01-03 18:46:20 -05:00
MuhreenandGitHub e34a220aac Add files via upload 2020-01-03 20:17:27 -03:00
quotefoxandGitHub d108de122c Merge pull request #139 from SynnGraffkin/Bye-Bye-Greenshift-and-shitvote
[Merge Conflict] Removes Fake Greenshift and Obfuscated voting
2020-01-03 23:13:31 +00:00
quotefoxandGitHub 4da5d63e7f Merge pull request #127 from shellspeed1/Fixes-heat-icons-swapped
Fixes heat icons swapped
2020-01-03 23:05:28 +00:00
quotefoxandGitHub a7fde7f494 Merge pull request #101 from Kraseo/grug-smash-rock
Crusher QOL changes
2020-01-03 23:04:56 +00:00
quotefoxandGitHub 30ed0ecef2 Merge pull request #138 from Code-Cygnet/master
Captain cocktail
2020-01-03 23:03:09 +00:00
quotefoxandGitHub 11b772557b Merge pull request #142 from SynnGraffkin/Robit-voices
Fixes Robodrobe Contraband Items
2019-12-22 07:21:20 +00:00
quotefoxandGitHub 370bafd225 Merge pull request #144 from shellspeed1/new-moth-fluff
Massively buffs insects (ports new moth wings and markings from tg)
2019-12-22 07:20:54 +00:00
quotefoxandGitHub 02b53ba388 Merge pull request #145 from shellspeed1/clothing-port
Ports Christmas clothing, and ports some loadout item additions.
2019-12-22 07:19:31 +00:00
quotefoxandGitHub ac66b013a2 Merge pull request #143 from SynnGraffkin/Extended-Plus
Fixes Crew Transfer
2019-12-22 07:19:16 +00:00
shellspeed1 02c6f1dca3 Update suits.dmi
fixes santa outfit
2019-12-21 02:58:24 -08:00
shellspeed1 87c59c8ec6 clothing 2019-12-21 02:38:06 -08:00
shellspeed1 3494c2a0d5 buffs moths 2019-12-20 22:48:08 -08:00
shellspeed1andGitHub 756cebd8fd Merge pull request #8 from quotefox/master
a
2019-12-20 21:59:43 -08:00
Toast 28885c6dc8 Fixed Crew Transfer
IT JUST WORKS, IT JUST WORKS,
LITTLE LIES, STUNNING SHOWS,
PEOPLE BUY, MONEY FLOWS, IT JUST WORKS
2019-12-20 17:54:19 -05:00
Toast ab78cb7f68 Fixed Techpriest not showing on contraband 2019-12-20 01:24:51 -05:00
quotefox 6490a36ec5 fix to research 2019-12-18 19:29:16 +00:00
quotefox 40c3008637 Revert "Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams""
This reverts commit 6ac8540d7e.
2019-12-18 18:53:50 +00:00
quotefox 6ac8540d7e Revert "Merge pull request #123 from SynnGraffkin/Advanced-Cams"
This reverts commit 9f1d03b6f7, reversing
changes made to d1e1862412.
2019-12-18 18:39:34 +00:00
quotefoxandGitHub 5b5b8d137a Merge pull request #107 from shellspeed1/nerfs-research-point-generation-from-bz
Nerfs research point generation from bz
2019-12-18 15:27:59 +00:00
quotefoxandGitHub 3b09e0c28f Merge pull request #141 from Detective-Google/Caks-for-all
Changes the birthday cake to use normal ingredients
2019-12-18 15:23:24 +00:00
quotefoxandGitHub a43d8537e8 Merge pull request #140 from SynnGraffkin/Kitchenry
Plastic Cutlery
2019-12-18 15:22:39 +00:00
Detective Google 44c7116548 Changes the birthday cake to use normal ingredients(a-la TG) since we don't have a cakehat on our map 2019-12-15 11:20:31 -06:00
Toast d4430410c2 Dumb Datums 2019-12-14 02:19:02 -05:00
Toast 891489ff6d Plastic Cutlery 2019-12-14 01:54:53 -05:00
Toast 2c97fceda6 Removes Fake Greenshift and Obfuscated voting 2019-12-14 00:07:56 -05:00
Code-CygnetandGitHub 4d24138728 Adds sprite for Commander and Chief 2019-12-13 15:54:13 -05:00
Code-CygnetandGitHub be5b9878bf Update drinks_recipes.dm
Edited to resolve conflict.
2019-12-13 15:51:26 -05:00
Code-CygnetandGitHub 97a4e06799 Merge pull request #2 from Code-Cygnet/Code-Cygnet-Mindtrait
Mind Trait Added
2019-12-13 15:48:08 -05:00
Code-CygnetandGitHub 2fd4df92e7 Adds Commander and Chief 2019-12-13 15:20:30 -05:00
Code-CygnetandGitHub ad157dd022 Adds Commander and Chief 2019-12-13 14:42:44 -05:00