shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,922 Commits 5 Branches 0 Tags
ee1b04eefb0f005652df9040371b67383d6830dc
Commit Graph

9034 Commits

Author SHA1 Message Date
Fermi
ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Fermi
f4c5e6fd2f Attempts to deal with the potential future problem of people stunlocking 2019-08-06 16:43:55 +01:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master 
YARR
 2019-08-06 16:08:16 +01:00
BlackMajor
030b5f6bca Merge pull request #8989 from Citadel-Station-13/kevinz000-patch-66 
[SPEEDMERGE] I BROKE SUBTLER
 2019-08-06 21:45:45 +12:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000
ed30f9ba58 Merge pull request #9046 from Sishen1542/satdeleite 
meteor sats are no longer dense objects
 2019-08-05 00:50:04 -07:00
kevinz000
4f0dc33d1b Merge pull request #9021 from Ghommie/Ghommie-cit174 
Ports "Adds techpriest robes and adds them to the RoboDrobe"
 2019-08-05 00:49:29 -07:00
kevinz000
f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167 
Fixes inactive high luminosity eyes turning back on as soon as you move around.
 2019-08-05 00:49:14 -07:00
kevinz000
cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular 
Ummodular a few files - Fixes Freelance Crate costs
 2019-08-05 00:47:28 -07:00
kevinz000
9852084200 Merge pull request #9019 from Ghommie/Ghommie-cit172 
Adds in a stereotypical vegetarian MRE. Tweaks the rest.
 2019-08-05 00:44:15 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
kevinz000
c92e8b43bf Merge pull request #9042 from EgoSumStultus/femur-breaker 
[ THE FEMUR BREAKER ]
 2019-08-04 22:27:42 -07:00
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
kevinz000
2654a5388e Merge pull request #9024 from Ghommie/Ghommie-cit176 
Ports "Lizardwine drink crafting fix"
 2019-08-04 19:22:52 -07:00
kevinz000
489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166 
Adds in worn overlays for different types of cuffs.
 2019-08-04 19:19:19 -07:00
kevinz000
5cfb7ef49d Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20 
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
 2019-08-04 19:18:53 -07:00
kevinz000
7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes 
Tweaks cakes, adds in more of them as well as a few more tarts - All hidden
 2019-08-04 19:15:18 -07:00
kevinz000
afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations 
Fixed WarOps Challenge incorrectly counting players
 2019-08-04 19:14:08 -07:00
kevinz000
e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203 
fixes a few snowcones being bad grammared
 2019-08-04 19:13:44 -07:00
kevinz000
8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170 
undergarment fixes.
 2019-08-04 19:13:21 -07:00
kevinz000
f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix 
Fixes a runtime with a simple mob verb
 2019-08-04 19:12:57 -07:00
kevinz000
53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes 
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
 2019-08-04 19:09:36 -07:00
kevinz000
4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock 
Adds the ability to construct and deconstruct locker locks
 2019-08-04 19:07:35 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Fermi
ffa717e8d7 Prevents Eigenlockers from teleporting people to CC via cargoshuttle. 2019-08-04 19:39:14 +01:00
Sishen
51943d4c75 dduhhhhhhhd duurrrrrrrr 2019-08-04 04:56:55 -04:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun 
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
 2019-08-03 00:48:59 -07:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
EgoSumStultus
4de05fc692 AAAAAAAAAAAAHHHHHHHHHHH 2019-08-02 06:48:14 -07:00
kevinz000
eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164 
Makes staminaloss also apply the oxyloss fullscreen overlay.
 2019-08-02 01:43:46 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting 
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
 2019-08-02 00:57:05 -07:00
kevinz000
eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator 
Alert Level is now displayed at the job selection screen.
 2019-08-02 00:55:18 -07:00
kevinz000
caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204 
Fixes Pound and hardware cake
 2019-08-01 23:29:27 -07:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun 
Makes a new traitor Emitter gun for Engi memes
 2019-08-01 23:29:10 -07:00
kevinz000
84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting 
Hallucination Sting Buffs
 2019-08-01 23:26:37 -07:00
kevinz000
0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf 
REMOVES SHIELF
 2019-08-01 23:25:52 -07:00
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Poojawa
b5fcaf20e6 Fixes a runtime with a simple mob verb 2019-08-01 17:40:43 -05:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
BurgerLua
c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021 Added 2019-07-31 16:40:35 -07:00
Ghommie
a9b16701a1 Ports "Lizardwine drink crafting fix" 2019-08-01 00:31:14 +02:00
Ghommie
438c3253d0 Taur snowflake code makes me sick. 2019-07-31 22:01:05 +02:00
Ghommie
7c9c51b777 Ports "Adds techpriest robes and adds them to the RoboDrobe" 2019-07-31 21:54:55 +02:00
Ghommie
d9a09d7211 Undoes a few things. 2019-07-31 21:23:20 +02:00
Ghommie
1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. 2019-07-31 21:02:12 +02:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Trilbyspaceclone
c68fb90955 Update snacks_cake.dm 2019-07-31 12:03:56 -04:00