shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,142 Commits 5 Branches 0 Tags
6bdf5f585ab7fcc25ebf95ceaca678017dc59c76
Commit Graph
13177 Commits
Author SHA1 Message Date
Sishen1542GitHubGhom
 		e07493b0fa Update code/modules/mob/living/carbon/human/species.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-05-27 20:53:35 -04:00
Sishen 8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
Ghommie cc334b9a57 honestly if they don't wear a gas mask, they do deserve the stunlock... 
But ok.
 2019-05-28 00:43:54 +02:00
Ghommie b5c4a44f01 pepper spray & teargas de-dunked. 2019-05-28 00:30:55 +02:00
kevinz000andGitHub aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13 
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
 2019-05-27 15:09:11 -07:00
kevinz000andGitHub 031779a944 32 --> 25 2019-05-27 14:28:17 -07:00
kevinz000andGitHub 6ed955ddde Update beams.dm 2019-05-27 14:25:45 -07:00
kevinz000andGitHub 4913f332c7 Update stun.dm 2019-05-27 14:23:29 -07:00
kevinz000andGitHub e8036a8a9b Merge pull request #8439 from Ghommie/Ghommie-cit18 
stunbaton status rework.
 2019-05-27 14:08:52 -07:00
kevinz000andGitHub 76314e463e Merge pull request #8443 from deathride58/stripfix 
Item stripping no longer gets interrupted by changes in your actively held item
 2019-05-27 14:08:04 -07:00
JTGSZ 93813613aa Some changes. 2019-05-27 14:42:07 -04:00
Poojawa 333964fe02 Fixes atmos and station alert consoles not updating visually 2019-05-27 06:33:30 -05:00
kevinz000andGitHub ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix 
Flavor text with special characters don't get partially unescaped
 2019-05-27 03:31:49 -07:00
kevinz000andGitHub e0a0be9e4e Merge pull request #8440 from BurgerLUA/Sensor-Improvement 
Improves Crew Monitoring Console Sorting
 2019-05-27 03:30:39 -07:00
kevinz000andGitHub 843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits 
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
 2019-05-27 03:30:07 -07:00
kevinz000andGitHub 573f60fbc2 Merge pull request #8437 from Trilbyspaceclone/patch-138 
[Ready] Adds more box crafting and white gloves to cloth
 2019-05-27 03:29:01 -07:00
kevinz000andGitHub 45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151 
suppressors now only cost 1 tc
 2019-05-27 03:27:22 -07:00
kevinz000andGitHub 433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150 
Binary Translator Key costs 2 from 5
 2019-05-27 03:26:45 -07:00
kevinz000andGitHub 625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149 
Adv Syndicate Surgery Duffel Bag tweaks
 2019-05-27 03:26:26 -07:00
kevinz000andGitHub 2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143 
Makes laser scatter shot cost 4 not 5
 2019-05-27 03:25:56 -07:00
kevinz000andGitHub b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154 
ultra clown fireing pins
 2019-05-27 03:24:47 -07:00
kevinz000andGitHub e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145 
Reduces FRAME cart by 2tc
 2019-05-27 03:23:33 -07:00
TrilbyspacecloneandGitHub 689077a54d grammar 2019-05-27 04:57:10 -04:00
TrilbyspacecloneandGitHub 6633ff4533 grammar 2019-05-27 04:47:56 -04:00
TrilbyspacecloneandGitHub f2ee85371d Update shields.dm 2019-05-27 04:40:47 -04:00
TrilbyspacecloneandGitHub a244bf33f7 Update recipes.dm 2019-05-27 04:39:06 -04:00
TrilbyspacecloneandGitHub 1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04:00
TrilbyspacecloneandGitHub 962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
TrilbyspacecloneandGitHub 6b05ccbda8 Update uplink_items.dm 2019-05-26 22:51:22 -04:00
TrilbyspacecloneandGitHub 21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
TrilbyspacecloneandGitHub 254e84e46b Update uplink_items.dm 2019-05-26 22:44:17 -04:00
TrilbyspacecloneandGitHub b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
TrilbyspacecloneandGitHub ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
TrilbyspacecloneandGitHub 4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
TrilbyspacecloneandGitHub a633d3202a It was 2019-05-26 22:22:31 -04:00
kevinz000andGitHub fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix 
Ass Fix
 2019-05-26 19:19:13 -07:00
TrilbyspacecloneandGitHub 2dde7e8451 Update uplink_items.dm 2019-05-26 22:18:56 -04:00
TrilbyspacecloneandGitHub 7bc3aa4cf1 Update uplink_items.dm 2019-05-26 22:11:36 -04:00
TrilbyspacecloneandGitHub 5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
TrilbyspacecloneandGitHub a628c81474 Update uplink_items.dm 2019-05-26 21:56:37 -04:00
TrilbyspacecloneandGitHub 06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
Ghommie 37aa491fa5 removes emp downtime, Kev's request. 2019-05-27 02:30:03 +02:00
kevinz000andGitHub d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17 
lazyinitlist on IAA targets stealing.
 2019-05-26 17:23:05 -07:00
kevinz000andGitHub e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes 
Rewords Blood Cult 'offer' rune click here prompt.
 2019-05-26 17:22:43 -07:00
dtfe3andGitHub f56960ff88 Fract said max 35 2019-05-27 00:39:48 +02:00
dtfe3andGitHub 38a6c1f917 Decreased the increase from 45 to 40 2019-05-27 00:22:50 +02:00
dtfe3andGitHub 745df721ba CWC player requirement increase 
Player requirement increase from 30 to 45

well basically most people dislike CWC in lowpop and it's generally unbalanced during lowpop so let's just not have it happen during lowpop. Easy fix!
 2019-05-26 23:20:27 +02:00
deathride58 375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
GhomGitHubdeathride58
 		7e10b4bed9 Update code/game/objects/items/stunbaton.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-26 22:03:38 +02:00
TrilbyspacecloneandGitHub 057fd54d92 Update packs.dm 2019-05-26 15:25:04 -04:00