shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,834 Commits 5 Branches 0 Tags
77edc602dcbfa592468efce3102b4716b1394476
Commit Graph
19919 Commits
Author SHA1 Message Date
GhomandGitHub 42416483e7 Merge pull request #11175 from keronshb/NaniteFixes 
Fixes healing nanites
 2020-02-21 16:46:19 +01:00
Winter Flare d112556ea3 Fix, New Category, file renames. 
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
 2020-02-21 09:34:13 -05:00
Winter Flare 34c8315c2f I forgot to hit save. 2020-02-21 07:26:32 -05:00
Winter Flare 79967b0ac5 Resolving some convos. 
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
 2020-02-21 07:16:39 -05:00
YakumoChenandGitHub 2f2ddbad5a removes density from skulls 2020-02-21 12:07:58 +00:00
YakumoChenandGitHub 34f1b5d1c8 legion heads now swarm 2020-02-21 10:36:57 +00:00
TrilbySpaceClone 9ae903187f always abuzz 2020-02-21 04:18:24 -05:00
Putnam 146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
TrilbySpaceClone 7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
TrilbyspacecloneandGitHub 58df6486cb Hey hey people, grammar here. 2020-02-21 03:06:38 -05:00
TrilbyspacecloneandGitHub f35ee95d67 Update heart.dm 2020-02-21 01:54:23 -05:00
TrilbyspacecloneandGitHub 4542afa537 Update trek.dm 2020-02-21 01:14:09 -05:00
Detective Google 04f6559b3d fixes the janky jobs panel 2020-02-20 23:12:28 -06:00
Detective Google 141bd96430 man FUCK psychs 2020-02-20 22:46:37 -06:00
Hatterhat 07222cfd9a *snap 2020-02-20 22:21:25 -06:00
Detective Google 4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
TrilbyspacecloneandGitHub 38f243e1c2 Update language_holder.dm 2020-02-20 22:15:32 -05:00
GhomandGitHub aceb76283f Merge pull request #11176 from Putnam3145/why-what 
Fixing IRV again or: how I learned to start worrying and actually hate byond
 2020-02-21 03:50:47 +01:00
Putnam 9f9881b57e this is so sad 2020-02-20 18:43:36 -08:00
GhomandGitHub 8395ee53e7 Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh 
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
 2020-02-21 02:47:18 +01:00
GhomandGitHub e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01:00
keronshb 7a1bc9d22b Fixes the travis issues 
Fixes the travis issues, Exo still remains a mystery
 2020-02-20 19:11:04 -05:00
Putnam a49260e0ac Revert "maybe this'll work." 
This reverts commit 8d00f11fc1.
 2020-02-20 16:03:00 -08:00
Putnam 8d00f11fc1 maybe this'll work. 2020-02-20 16:01:06 -08:00
keronshb 4ca9eb4171 Fixes healing nanites 
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.

Also changed one line on Exo nanites but it doesn't fix those.  Dunno what to do.
 2020-02-20 18:11:54 -05:00
LinandGitHub 9999e15db9 Merge pull request #11155 from necromanceranne/cham_project_exploities 
Cham projector no longer lets you become literally unclickable
 2020-02-20 16:50:07 -06:00
GhomandGitHub 613158fe4e Merge pull request #11157 from Putnam3145/lick-pref 
Lick pref
 2020-02-20 20:53:27 +01:00
GhomandGitHub 4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares 
Fixes nightmares deleting guns with flashlights
 2020-02-20 20:52:29 +01:00
GhomandGitHub 7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault 
Removes harm prevention clause indicators from relevant sources.
 2020-02-20 15:33:27 +01:00
GhomandGitHub 6347dab0a3 Merge pull request #11142 from kevinz000/vampire_haste 
makes vampire haste more reliable and slightly less of an example of how not to code
 2020-02-20 15:31:39 +01:00
GhomandGitHub 608bb0a04c Merge pull request #10649 from kevinz000/hijack 
Completely reworks the hijack objective, and shuttle hijacking in general
 2020-02-20 14:40:08 +01:00
kevinz000andGitHub ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587 
Fixing addiction moodlets not going away and secret sauce recipe paper.
 2020-02-20 06:17:33 -07:00
GhomandGitHub 26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 
Ports Broom, Tweak Janitor Vendor
 2020-02-20 11:48:06 +01:00
GhomandGitHub d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
GhomandGitHub 32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15 
buffs pai radio short 5 -> 3 minutes
 2020-02-20 11:26:17 +01:00
GhomandGitHub 89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
GhomandGitHub 8c7e760f18 Merge pull request #11166 from Putnam3145/why-what 
Fixing IRV
 2020-02-20 11:14:15 +01:00
GhomandGitHub f94f997cc2 Merge pull request #11080 from kevinz000/surubatons 
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
 2020-02-20 11:09:46 +01:00
GhomandGitHub 7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12 
projectiles now pierce through pAIs no matter what
 2020-02-20 11:09:03 +01:00
GhomandGitHub c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17 
removes pai fulltile opacity
 2020-02-20 11:08:27 +01:00
GhomandGitHub e9d0f536de Merge pull request #11146 from Putnam3145/supermatter-hardcap 
Hardcaps supermatter damage from ballistics and similar
 2020-02-20 11:08:14 +01:00
GhomandGitHub 1f42e9f451 Merge pull request #11149 from Putnam3145/fix-vendor-badcode 
fixes mining vendors failing and eating your points iff you have exactly enough points
 2020-02-20 11:07:51 +01:00
GhomandGitHub 22a041f72b Merge pull request #11160 from Hatterhat/chem-combat-sucked-anyway 
a mouth cover check for pies
 2020-02-20 11:00:00 +01:00
TrilbySpaceClone 5401796a5f corrections 2020-02-20 02:40:34 -05:00
Putnam 71c71766e6 one of those runtimes that will never show up in play but boy howdy 2020-02-19 21:53:22 -08:00
kevinz000andGitHub d7403b3436 john doe 2020-02-19 22:26:10 -07:00
kevinz000andGitHub 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000andGitHub fd410963a9 Update teleportation.dm 2020-02-19 22:23:54 -07:00
kevinz000andGitHub 4373f116e0 Update teleportation.dm 2020-02-19 22:07:03 -07:00