shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,796 Commits 5 Branches 0 Tags
db87da599c19afda6b62af80cdab2c0bce0c47fa
Commit Graph

1810 Commits

Author SHA1 Message Date
kevinz000 1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghom 97c5eb9b8f Fixing chargers not putting the item in hands 2020-05-08 22:20:54 +02:00
kevinz000 61692f290a Merge pull request #12121 from Ghommie/Ghommie-cit723 
Generic skills support for items, level based skill type. Wiring skill.
 2020-05-08 01:24:44 -07:00
kevinz000 43dc1319d9 Merge pull request #12097 from Ghommie/Ghommie-cit720 
Implementing the NO_PUBLIC_LATHE build_type flag.
 2020-05-07 21:04:57 -07:00
Ghommie 60bdbfaf61 Merge conflicts, procs instead of macros, mood signals. 2020-05-08 02:12:41 +02:00
kevinz000 7c54da65a2 The great material rebalance (#12123) 
* haha bet

* Update stock_parts.dm

* ok
 2020-05-07 18:16:14 +02:00
Ghommie f770586407 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723 2020-05-05 05:09:29 +02:00
Ghommie 643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Ghom 161da560b6 Update autolathe.dm 2020-05-03 07:17:18 +02:00
Ghommie 843f43b4ad Some autolathe issue. 2020-05-03 06:27:38 +02:00
Ghommie 2cbb659eb9 Implementing the NO_PUBLIC_LATHE build_type flag. 2020-05-03 06:15:40 +02:00
kevinz000 5bf7fd0030 Merge pull request #12087 from Ghommie/Ghommie-cit718 
Fixing more issues.
 2020-05-02 15:56:28 -07:00
Lin f659c036ef Merge pull request #12036 from kevinz000/electrochromatic_windows 
Electrochromatic (dim-on-demand) windows
 2020-05-02 19:13:29 +00:00
Ghommie 202b517fa0 Fixing more issues. 2020-05-02 02:05:56 +02:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000 f70490c61d fixes 2020-04-26 04:40:18 -07:00
kevinz000 d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
Ghommie 0c1c879fb4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-04-25 02:49:59 +02:00
Putnam 95d1a25df7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller 2020-04-24 16:07:38 -07:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Putnam 44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
kevinz000 3c4c67b6c5 Merge pull request #11869 from necromanceranne/pawnch_updaties 
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
 2020-04-17 05:43:49 -07:00
necromanceranne d0d766efb5 Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts 2020-04-15 19:00:01 +10:00
Linzolle f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
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
kevinz000 6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672 
Minor action datum refactor and spellcasting fix.
 2020-04-12 17:02:36 -07:00
kevinz000 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
Ghom 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
ForrestWick 0a54f8a7a0 I'M SORRY MR GITHUB PLS DONT BEAT ME 2020-04-09 17:27:18 -05: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
kevinz000 779766d1f6 Merge pull request #11759 from Trilbyspaceclone/telecoms 
Makes upgrading telecoms more usefull
 2020-04-09 02:38:10 -07:00
kevinz000 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
Ghom e2d2f5a4ad Update minesweeper.dm 2020-04-04 14:04:47 +02:00
Ghom 3c9a9136b5 Update minesweeper.dm 2020-04-04 13:46:21 +02:00
kevinz000 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