Commit Graph

10291 Commits

Author SHA1 Message Date
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
Sishen 582b355224 Update guardian.dm 2019-08-08 11:00:23 -04: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
Sishen 1f05123816 ook ook 2019-08-08 03:04:51 -04:00
Sishen f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
Ghommie df5366e911 Removes a redunant Remove() from high luminosity eyes. 2019-08-08 05:06:53 +02:00
BurgerLUA f33b9fa480 Merge branch 'master' into Actual-War-Ops 2019-08-07 19:50:47 -07:00
Ghommie 23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000 65473dc4ba s 2019-08-07 13:18:45 -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
Poojawa b5841c718b Genpop for security 2019-08-07 06:14:35 -05: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
Sishen 9f5b54940c adds in a memento mori check 2019-08-05 21:31:17 -04:00
EgoSumStultus d9a6be301a more fixes 2019-08-05 07:47:47 -07:00
EgoSumStultus 55b39a9cc6 male AI vox 2019-08-05 05:01:43 -07:00
Sishen e3c3742aec Update guardian.dm 2019-08-05 06:27:10 -04:00
kevinz000 48db0b129e Update hierophant.dm 2019-08-05 01:55:05 -07:00
kevinz000 58f8920008 Update hierophant.dm 2019-08-05 01:51:51 -07:00
kevinz000 fb4709f6db Update hierophant.dm 2019-08-05 01:49:28 -07: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
Ghommie b1b4d63619 Removes flashproofness, moves slowndown to under. 2019-08-05 06:07:45 +02: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