shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,009 Commits 5 Branches 0 Tags
b2eda962d13199fc8eaf57d8d0e2f173f1bd5b0d
Commit Graph

9063 Commits

Author SHA1 Message Date
kevinz000
b2eda962d1 Merge pull request #9093 from MrJWhit/Change-IAA-Text 
Adds a line in the spawntext for IAA
 2019-08-11 08:34:21 -07:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
kevinz000
b3b22029a6 Merge pull request #9064 from cebutris/hugloves 
Hugs of the North Star
 2019-08-09 22:20:18 -07:00
kevinz000
74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181 
Two lines fixes for invisible zipties and borked legcuffs.
 2019-08-09 22:17:31 -07:00
kevinz000
f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit 
Strawbarries, and more
 2019-08-09 22:16:34 -07:00
kevinz000
b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185 
Fixes clock cult mass recall.
 2019-08-09 22:16:09 -07:00
kevinz000
14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186 
underwear colors fix 2: The revenge of the crunch.
 2019-08-09 22:15:55 -07:00
MrJWhit
77e0551616 Adds a line in the spawntext for IAA 
Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext
 2019-08-09 13:56:07 -04:00
Ghommie
ee57720ee3 underwear colors fix 2: The revenge of the crunch. 2019-08-09 05:11:12 +02:00
Ghommie
eb3ae1d61a Fixes clock cult mass recall. 2019-08-09 04:05:06 +02:00
TrilbySpaceClone
ab13b62bdd fruits of labor 2019-08-08 16:14:04 -04:00
Fermi
1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
BurgerLua
9566caa527 Added 2019-08-08 09:25:04 -07:00
Fermi
004b79d4cd Vodka is alkaline 2019-08-08 15:31:07 +01:00
kevinz000
8b20413676 Merge pull request #9069 from Ghommie/Ghommie-cit183 
Fixes cults teleportations.
 2019-08-08 01:58:48 -07:00
Ghommie
9e41731ed1 Fixes cult runes teleporting you from the source turf to the source turf. 2019-08-07 21:35:15 +02:00
Fermi
99e95dcedf Guess who forgot message admins 2019-08-07 18:57:38 +01:00
Ghommie
00bca0dd39 raise priority. 2019-08-07 19:20:14 +02:00
Fermi
10b2cec485 Adds a analyse function for advanced chems 2019-08-07 16:52:58 +01:00
Thalpy
2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
kevinz000
a845b5ae0c Merge pull request #8986 from Ghommie/Ghommie-cit163 
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
 2019-08-07 00:49:23 -07:00
kevinz000
27667d467b Merge pull request #8673 from Trilbyspaceclone/patch-179 
Makes upgraded prostics worth getting - Re-balances robotic lims
 2019-08-07 00:45:34 -07:00
Ghommie
2f65700913 Fixes clock cult Abscond. 2019-08-07 06:12:14 +02:00
Cebutris
d0b8e054fd Added hug gloves as their own item, removing the feature from regular GotNS 2019-08-06 16:42:35 -04:00
Fermi
ee1b04eefb Fixes potential "trapped as ghost" problems and examine+scanner text 2019-08-06 19:54:07 +01:00
Cebutris
564aa9b4cb Gloves of the north star now work for hugging and patting 2019-08-06 13:01:49 -04: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