shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,973 Commits 5 Branches 0 Tags
e588b504c1b207fdcd322c2aeeb2f31be4aa4e27
Commit Graph
1782 Commits
Author SHA1 Message Date
Artur fb7dc7a54c Fucking icons 2020-04-14 09:42:11 +03:00
Artur 356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
kevinz000andGitHub 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
kevinz000andGitHub d60932ca5d Merge pull request #11697 from Ghommie/Ghommie-cit655 
Ports "Obliterates item_color: new washing machine functionality edition"
 2020-04-12 16:16:37 -07:00
GhomandGitHub f5852424e3 Merge pull request #11812 from Auris456852/master 
Adds admin printer noise for Centcomm/Syndicate messages
 2020-04-12 06:25:52 +02:00
Ghommie 31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +02:00
spookydonut 230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Auris456852 03f583e5ff Adds admin printer noise for Centcomm/Syndicate messages 2020-04-10 18:50:52 +03:00
Ghommie 7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
kevinz000andGitHub 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms 
Makes upgrading telecoms more usefull
 2020-04-09 02:38:10 -07:00
kevinz000andGitHub 956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
TrilbySpaceClone bfa83591df what if we made upgrading them more usfull 2020-04-06 07:35:36 -04:00
necromanceranne 33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10:00
GhomandGitHub e2d2f5a4ad Update minesweeper.dm 2020-04-04 14:04:47 +02:00
GhomandGitHub 3c9a9136b5 Update minesweeper.dm 2020-04-04 13:46:21 +02:00
kevinz000andGitHub 010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660 
Minesweeper armageddon improvements
 2020-04-03 21:55:16 -07:00
necromanceranne 0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
Ghommie 73c52c0c6e Accurate minefield. 2020-04-01 05:19:29 +02:00
Ghommie 04c8cb09a4 out of bounds coordinates sanity 2020-04-01 04:41:21 +02:00
Ghommie 736760ac06 Minesweeper oopsies etcetera. 2020-04-01 04:39:36 +02:00
kevinz000andGitHub b3642a3470 Merge pull request #11681 from PersianXerxes/medicalTGUINext 
TGUI Next in the Medbay
 2020-03-31 18:02:11 -07:00
Artur a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
kevinz000andGitHub 2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07:00
kevinz000GitHubGhom
 		6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
KathrinBailey b6202ad5a5 Gives shutters glass so the close proc doesn't change opacity 2020-03-30 02:36:27 +01:00
Persi 304b2c68bf Finished, after a way too long break! 2020-03-29 09:36:40 -04:00
Persi 0bc6a3d4b6 Updating 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
 2020-03-29 08:35:15 -04:00
actioninja abde27c098 layer changes 2020-03-28 23:50:08 -07:00
kevinz000andGitHub 6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
Ghommie 41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Seris02 17f4b0f34f I assume this works 2020-03-26 17:46:41 +08:00
KathrinBailey 134d861fd7 KAT SHUTTERS ALL OF THE STUFF 
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
 2020-03-24 20:13:48 +00:00
Artur 9bb7529a49 Progress 2020-03-24 16:55:46 +02:00
Artur c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00
Putnam3145andGitHub 368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
kevinz000GitHubGhom
 		0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
kevinz000andGitHub d1da7c8131 Merge pull request #11529 from Trilbyspaceclone/patch-312 
Small pipes
 2020-03-20 22:57:43 -07:00
kevinz000andGitHub 7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595 
Yeets the preferences_vore datum and migrates its stuff to preferences.
 2020-03-19 08:30:18 -07:00
Seris02andGitHub ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520) 
* yeet gone

* pfft oof

* oof
 2020-03-19 13:40:11 +01:00
TrilbyspacecloneandGitHub 700a2031c8 Update construction.dm 2020-03-19 00:40:59 -04:00
kevinz000andGitHub 0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix 
Fixes being unable to remove turret guns
 2020-03-17 09:26:04 -07:00
kevinz000andGitHub 1585b34e41 Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1 
Fixing a couple issues with recyclers.
 2020-03-16 13:23:46 -07:00
kevinz000andGitHub fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623 
Banana pies, beams. runtime errors and warnings.
 2020-03-16 13:22:49 -07:00
necromanceranne fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11:00
Seris02andGitHub 259bb03969 fixes the swapping of buttons (#11475) 2020-03-16 01:57:55 +01:00
GhomandGitHub 2b9f352a14 Fixing a couple issues with recyclers. 2020-03-15 22:12:55 +01:00
Ghommie b453a25e14 Something about banana pies, runtime errors and warnings. 2020-03-15 15:41:32 +01:00