 Ghommie
|
3de0e545c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-05-05 05:44:55 +02:00 |
|
|
kevinz000andGitHub
|
5bf7fd0030
|
Merge pull request #12087 from Ghommie/Ghommie-cit718
Fixing more issues.
|
2020-05-02 15:56:28 -07:00 |
|
|
kevinz000andGitHub
|
b68f1aaf72
|
Merge pull request #12084 from Ghommie/Ghommie-cit717
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
|
2020-05-02 15:55:19 -07:00 |
|
|
Ghommie
|
202b517fa0
|
Fixing more issues.
|
2020-05-02 02:05:56 +02:00 |
|
|
Ghommie
|
b383066e57
|
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
|
2020-05-02 00:00:49 +02:00 |
|
|
Ghommie
|
cd642aff73
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-05-01 22:12:00 +02:00 |
|
|
kevinz000andGitHub
|
269db0c7d6
|
Identification components + chameleon clothing from uplink is now obfuscated (#12045)
* fine we'll use components
* syndie kits
* Whew
* examine
* flags
* whew
* compile
* fix
* fix
* ok
* ok
* ok
* done
|
2020-05-01 18:39:45 +02:00 |
|
|
kevinz000andGitHub
|
24bac60a95
|
Merge pull request #12012 from Ghommie/Ghommie-cit710
Fixing non-skirt dresses being invisible on digitigrades.
|
2020-04-25 17:05:49 -07:00 |
|
|
LinandGitHub
|
25c9653540
|
Merge pull request #11966 from NopemanMcHalt/digi-justice
Fixes cosmetic tactifool sprite not using digitigrade sprites
|
2020-04-25 03:31:04 +00:00 |
|
|
Ghommie
|
0f654d9f0e
|
Fixing dresses being invisible on digitigrades.
|
2020-04-25 02:23:13 +02:00 |
|
|
GhomandGitHub
|
e4c6df71fc
|
Update tacklers.dm
|
2020-04-23 14:35:36 +02:00 |
|
|
kevinz000andGitHub
|
c43f4e2e5e
|
Update tacklers.dm
|
2020-04-22 22:27:48 -07:00 |
|
|
kevinz000
|
af222768fe
|
Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
|
2020-04-22 22:27:17 -07:00 |
|
|
kevinz000andGitHub
|
b6a47a06ed
|
Update tacklers.dm
|
2020-04-22 22:26:39 -07:00 |
|
|
LinandGitHub
|
7f271157c3
|
Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
|
2020-04-22 20:33:12 +00:00 |
|
|
GhomandGitHub
|
aab62f196d
|
Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
|
2020-04-22 03:32:07 +02:00 |
|
|
LinandGitHub
|
3483ab7947
|
Merge pull request #11957 from Ghommie/Ghommie-cit696
Fixing CE jump suit/skirt and accessory overlays.
|
2020-04-21 22:17:16 +00:00 |
|
|
Anonymous
|
e6159b1a82
|
Actually, this is better.
|
2020-04-21 22:24:38 +03:00 |
|
|
Anonymous
|
21c304c5ad
|
Fixes cosmetic tactifool sprite not using digi
Also adds " to the armor values
|
2020-04-21 22:10:19 +03:00 |
|
|
Ghommie
|
01f444b761
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-21 20:45:58 +02:00 |
|
|
Ghommie
|
824904844c
|
Componentized for sanity.
|
2020-04-21 19:51:44 +02:00 |
|
|
GhomandGitHub
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
|
Ghommie
|
03e873478c
|
Fixing CE jump suit/skirt and accessory overlays.
|
2020-04-20 23:11:58 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
047bb6c162
|
Update hardsuit.dm
|
2020-04-20 16:19:30 -04:00 |
|
|
Ghommie
|
5a4fecdeb8
|
tested and it works now, I'm glad.
|
2020-04-20 19:22:42 +02:00 |
|
|
Ghommie
|
0bef955806
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-20 15:14:30 +02:00 |
|
|
Ghommie
|
3bef4b88ba
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-20 02:29:34 +02:00 |
|
|
Anonymous
|
043950a3ee
|
Merge branch 'master' into trek_tmp
# Conflicts Resolved:
# icons/obj/clothing/uniforms.dmi
|
2020-04-19 09:51:21 +03:00 |
|
|
Ghommie
|
9c8f6cd00f
|
peeves.
|
2020-04-19 02:03:05 +02:00 |
|
|
Ghommie
|
e3fb978465
|
Shielded element.
|
2020-04-19 01:48:51 +02:00 |
|
|
Artur
|
f0823bc2b6
|
Combat looks better
|
2020-04-18 13:57:34 +03:00 |
|
|
GhomandGitHub
|
6a0af190ea
|
I'm a bit busy handling multiple issues.
|
2020-04-17 20:47:02 +02:00 |
|
|
GhomandGitHub
|
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 |
|
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
Ghommie
|
3533ceb4ed
|
I'm tired.
|
2020-04-16 03:55:53 +02:00 |
|
|
Ghommie
|
586966ea51
|
General refactor for some snowflake bodyparts procs and taurs.
|
2020-04-16 03:37:52 +02:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
Artur
|
375c62175f
|
Finishing touches, fixes icons
|
2020-04-15 12:04:25 +03: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 |
|
|
LinandGitHub
|
79f41bc654
|
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
|
2020-04-14 18:37:31 +00:00 |
|
|
kevinz000andGitHub
|
e271376c4e
|
Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
|
2020-04-14 01:34:18 -07:00 |
|