shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,214 Commits 5 Branches 0 Tags
446e0df667dafb2f17ef78a2cd56d0ae350ecf44
Commit Graph

15682 Commits

Author SHA1 Message Date
kevinz000
665e95d827 compile 2020-02-21 15:03:22 -07:00
kevinz000
e85699df50 compile fix 2020-02-21 14:18:45 -07:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Trilbyspaceclone
9d414bd5a7 Yikes my bad 2020-02-21 15:29:56 -05:00
Trilbyspaceclone
9578c69f77 Update hivelord.dm 2020-02-21 15:24:27 -05:00
Putnam
0f9bda8f90 wow okay make it do this instead 2020-02-21 11:53:16 -08:00
Putnam
8e865a5081 Made power increase with raw damage. 2020-02-21 11:37:17 -08:00
YakumoChen
418374be06 beegion 2020-02-21 17:56:14 +00:00
Ghom
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
Artur
e08c89ce48 Reverts some 2020-02-21 15:10:39 +02: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
YakumoChen
2f2ddbad5a removes density from skulls 2020-02-21 12:07:58 +00:00
YakumoChen
34f1b5d1c8 legion heads now swarm 2020-02-21 10:36:57 +00: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
Trilbyspaceclone
58df6486cb Hey hey people, grammar here. 2020-02-21 03:06:38 -05:00
Trilbyspaceclone
f35ee95d67 Update heart.dm 2020-02-21 01:54:23 -05:00
raspyosu
28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
raspyosu
4de8391ba4 fix filenames zzzz 
does this work even time to fIND OUT
 2020-02-21 01:40:35 -05:00
raspyosu
7d769b3984 preemptive lunge buff 
range increased by 1
windup length decreased by 0.1s to 0.6s
grabbing system altered to make grabbing more instantaneous depending on range
telegraphing sound now plays to the user as well for feedback
 2020-02-21 01:34:22 -05:00
Trilbyspaceclone
4542afa537 Update trek.dm 2020-02-21 01:14:09 -05:00
Detective Google
141bd96430 man FUCK psychs 2020-02-20 22:46:37 -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
Trilbyspaceclone
38f243e1c2 Update language_holder.dm 2020-02-20 22:15:32 -05:00
Ghom
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
Ghom
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
Ghom
0f8f6e417b Merge branch 'master' into Ghommie-cit528 2020-02-21 02:40:22 +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
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
Ghom
613158fe4e Merge pull request #11157 from Putnam3145/lick-pref 
Lick pref
 2020-02-20 20:53:27 +01:00
Ghom
4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares 
Fixes nightmares deleting guns with flashlights
 2020-02-20 20:52:29 +01:00
Ghom
7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault 
Removes harm prevention clause indicators from relevant sources.
 2020-02-20 15:33:27 +01:00
Ghom
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
Ghom
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
kevinz000
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
Artur
5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates 2020-02-20 13:15:46 +02:00
Artur
35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +02:00
Ghom
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
Ghom
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
Ghom
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
Ghom
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
Ghom
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
Ghom
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
Ghom
c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17 
removes pai fulltile opacity
 2020-02-20 11:08:27 +01:00
Ghom
e9d0f536de Merge pull request #11146 from Putnam3145/supermatter-hardcap 
Hardcaps supermatter damage from ballistics and similar
 2020-02-20 11:08:14 +01:00
Ghom
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
Ghom
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