shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,974 Commits 5 Branches 0 Tags
2200c690f76bf9bf22bb992e23e7d259dad96261
Commit Graph
21482 Commits
Author SHA1 Message Date
kevinz000andGitHub ef0b81eabf Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4 
Fixed the epic nuke exploit
 2020-04-06 15:48:02 -07:00
kevinz000andGitHub a53096bdbf Merge pull request #11745 from Trilbyspaceclone/hide_and_seak 
Atomic PR 1 or 2 - Toilet Loot!
 2020-04-06 15:47:39 -07:00
kevinz000andGitHub d89170e441 Merge pull request #11748 from Trilbyspaceclone/patch-334 
Infested plasmamen now are miner type
 2020-04-06 15:47:00 -07:00
kevinz000andGitHub a80e6712b9 Merge pull request #11749 from Putnam3145/organ-conveyance 
Changed how scanners show organ damage.
 2020-04-06 15:46:49 -07:00
kevinz000andGitHub 699f891166 Merge pull request #11750 from Putnam3145/pluoxium 
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
 2020-04-06 15:46:09 -07:00
Timothy Teakettle aabcfb580b discounts rerolling is bad 2020-04-06 19:49:06 +01:00
Timothy Teakettle 864f9b3244 except this times its in the right order 2020-04-06 18:59:48 +01:00
Timothy Teakettle e8002ee449 imagine if it compiled and was less bad 2020-04-06 17:45:19 +01:00
Timothy Teakettle 3b322b9f7c population locked uplink items use current population 
yay?
 2020-04-06 17:34:34 +01:00
Ghommie f6db5764e3 Bringing back accidentally reverted solar panel fixes. 2020-04-06 18:20:34 +02:00
TrilbyspacecloneandGitHub faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747) 
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
 2020-04-06 17:53:43 +02:00
Putnam d43e8052ad More threat swinging 2020-04-06 08:49:19 -07:00
Ghommie b92da66f04 Fixing spellcasting and edge cases. 2020-04-06 17:32:51 +02:00
necromanceranne eece94caf3 puts a pop cap on the various martial arts. 2020-04-07 00:28:09 +10:00
TrilbyspacecloneandGitHub cb1e6b518d forgot to save last commit that fixes this 2020-04-06 08:50:37 -04:00
TrilbySpaceClone 2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
TrilbySpaceClone bfa83591df what if we made upgrading them more usfull 2020-04-06 07:35:36 -04:00
Artur c402c6dc30 Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/ 2020-04-06 13:24:52 +03:00
necromanceranne 60c8aab520 the damage_roll proc needs to always be before check_streak 2020-04-06 16:51:26 +10:00
Putnam 5f71efe07a Adds a message to the AI to reconnect, since this is a common bug 2020-04-05 22:41:50 -07:00
GhomandGitHub 33fc3ce1e0 Update spell.dm 2020-04-06 07:05:33 +02:00
necromanceranne ff4847b441 Adds the damage roll into a proc checked on each of the harm, disarm and grab acts and before a combo is complete, and also checks for whether we are in combat mode, lying down or if the target is in combat mode 2020-04-06 15:01:59 +10:00
necromanceranne 35f96a1c24 Merge branch 'pawnch_2_the_pawnchening' of https://github.com/necromanceranne/Citadel-Station-13 into pawnch_2_the_pawnchening 2020-04-06 13:42:40 +10:00
necromanceranne 1c50192c12 further fixing stuff 2020-04-06 13:42:23 +10:00
TrilbyspacecloneandGitHub 2ba342aa1a Update kitchen.dm 2020-04-05 23:11:25 -04:00
necromanceranneandGitHub d1e77ab087 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:31:16 +10:00
necromanceranne 33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10:00
necromanceranne a6bd6d23fe Some cleanup with help from rohesie, hopefully I figured it out 2020-04-06 12:28:14 +10:00
Putnam3145andGitHub 5108bf1fc3 Stuff about power (#11664) 
* Overhauled how APCs work, I guess

* Makes cells drain like before
 2020-04-06 04:26:14 +02:00
KathrinBailey adeb61180c big floof 2020-04-06 01:09:25 +01:00
Artur f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
Putnam 443af96126 Changed how scanners show organ damage. 2020-04-05 03:25:04 -07:00
Putnam 31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
TrilbyspacecloneandGitHub 7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
Putnam 1bf37dfb1b Doubles pluoxium specific heat 2020-04-04 22:04:37 -07:00
kevinz000andGitHub 956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
nik707andGitHub 09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
TrilbySpaceClone 15d9c9f0ae Revert "Revert "effort"" 
This reverts commit c3aaf27aa2.
 2020-04-04 11:01:21 -04:00
kevinz000andGitHub ed52038dda Merge pull request #11703 from Kraseo/public-tyranny 
Removes public mining from the game
 2020-04-04 07:39:13 -07:00
TrilbyspacecloneandGitHub 32b98cce44 rip funny commit 
//We care about you Skyrats!
 2020-04-04 10:38:11 -04:00
TrilbyspacecloneandGitHub 99bf1da408 your to you 2020-04-04 10:37:37 -04:00
Kraseo 70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
TrilbySpaceClone c3aaf27aa2 Revert "effort" 
This reverts commit 10ca01cc95.
 2020-04-04 10:23:14 -04:00
kevinz000andGitHub 09a5e234d3 Merge pull request #11716 from kiwedespars/lightpink-nerf 
stabilized lightpink nerf - stabilized purple buff
 2020-04-04 07:22:47 -07:00
TrilbySpaceClone 62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
kevinz000andGitHub adad236997 Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1 
What was I hoping for again?
 2020-04-04 07:16:20 -07:00
kevinz000andGitHub 2a2234483f Merge pull request #11727 from Putnam3145/vore-pacifist-fix 
Makes pacifists able to vore properly
 2020-04-04 07:15:54 -07:00
kevinz000andGitHub 5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000andGitHub 886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665 
Dwarfy message spam QoL.
 2020-04-04 07:11:02 -07:00
kevinz000andGitHub 9a0f0cab65 Merge pull request #11724 from Ghommie/Ghommie-cit664 
Stops one of the many monkey tricks with mob holders.
 2020-04-04 07:10:24 -07:00