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

1149 Commits

Author SHA1 Message Date
Anonymous
043950a3ee Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/obj/clothing/uniforms.dmi
 2020-04-19 09:51:21 +03:00
Ghom
6a0af190ea I'm a bit busy handling multiple issues. 2020-04-17 20:47:02 +02:00
Ghom
be0409a94a Update toggles.dm 2020-04-17 19:58:57 +02:00
Anonymous
383014bad3 Merge branch 'master' into trek_tmp 
# Conflicts Resolved:
#	icons/mob/clothing/uniform.dmi
#	icons/mob/clothing/uniform_digi.dmi
#	icons/obj/clothing/uniforms.dmi
 2020-04-17 19:40:17 +03:00
Ghommie
7581d1d5cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686 2020-04-17 18:37:25 +02:00
Ghommie
c5c75c0870 Fixing some more mistakes I did to clothing. 2020-04-17 18:32:11 +02:00
kevinz000
09f459a369 Merge pull request #11730 from Ghommie/Ghommie-cit667 
Minor snowflakes clothing variations refactor. Removal of copypasted states.
 2020-04-17 05:49:09 -07: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
Anonymous
4f6e849af4 Fixes pre-tmp trek suit on-mob icons 
Really speaks about nobody using trek loadout, huh?
 2020-04-17 14:04:47 +03:00
Anonymous
d61c0dc155 KHAAAAAAAAAAN!! 
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
 2020-04-17 10:53:43 +03:00
Ghommie
fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
Seris02
c0ff018bef fixes magboots 2020-04-16 16:23:55 +08: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
Lin
79f41bc654 Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4 
Hardsuit helmet peeve.
 2020-04-14 18:37:31 +00:00
kevinz000
e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07:00
Ghommie
42ff9b1d35 Final test, fixes and parent calls. 2020-04-14 01:23:26 +02:00
Ghommie
616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghommie
0816512150 more work. 2020-04-13 16:09:52 +02:00
Ghom
5765ceb316 Update hardsuit.dm 2020-04-13 15:02:01 +02:00
Ghom
873e67f79c Update hardsuit.dm 2020-04-13 14:57:47 +02:00
Ghom
dfa58cb517 Merge pull request #10986 from Seris02/atomwalkers 
wall walking boots for traitors
 2020-04-13 14:25:43 +02:00
Ghom
6157500f25 FYI, Dropped() already handles it. 2020-04-13 14:16:48 +02:00
Seris02
468c59bf49 oops 2020-04-13 20:12:20 +08:00
kevinz000
105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678 
Item color removal port fixes.
 2020-04-12 22:34:45 -07:00
Seris02
950038f4a7 merge fixes? 2020-04-13 11:12:16 +08:00
Seris02
f158536e59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-04-13 11:10:24 +08:00
Seris02
b9c9991a5d merge fix 2020-04-13 10:57:09 +08:00
Ghommie
0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02: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
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02: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
13f9c3c235 Update phantomthief.dm 2020-04-12 08:03:30 +02:00
Ghommie
acb5c39b59 Fixes the phantom thief component for the Xth time. 2020-04-12 07:47:28 +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
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
Ghommie
d2b624a908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-09 14:59:40 +02:00
kevinz000
7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix 
TGUI Next vendors plus spritesheet port from TG
 2020-04-09 03:53:08 -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
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
necromanceranne
b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now 2020-04-07 17:51:25 +10:00
Trilbyspaceclone
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
Artur
c402c6dc30 Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/ 2020-04-06 13:24:52 +03:00
necromanceranne
1c50192c12 further fixing stuff 2020-04-06 13:42:23 +10:00
necromanceranne
a6bd6d23fe Some cleanup with help from rohesie, hopefully I figured it out 2020-04-06 12:28:14 +10:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
necromanceranne
38586c9d92 I feel like this is more fitting 2020-04-04 20:09:09 +11:00
necromanceranne
4c051f70e8 fixes this too 2020-04-04 19:16:59 +11:00
necromanceranne
bd5446e906 NYOOPS 2020-04-04 18:21:18 +11:00