 Detective-GoogleandGitHub
|
c146c898c0
|
Merge branch 'master' into 91-files-changed-fml
|
2020-04-30 18:42:38 -05:00 |
|
|
kevinz000andGitHub
|
061265981d
|
Merge pull request #12052 from deathride58/fixescheetowalkers
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
|
2020-04-30 10:37:23 -07:00 |
|
|
kevinz000andGitHub
|
9d753fe74f
|
Update damage_procs.dm
|
2020-04-30 01:07:10 -07:00 |
|
|
kevinz000
|
f028672e3c
|
Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml
|
2020-04-30 01:00:08 -07:00 |
|
|
deathride58
|
95c7252d3f
|
fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade"
|
2020-04-29 00:01:26 -04:00 |
|
|
LinandGitHub
|
19f89ed1ba
|
Merge pull request #12022 from Ghommie/Ghommie-cit711
organ/on_life tweaks.
|
2020-04-29 01:15:02 +00:00 |
|
|
GhomandGitHub
|
858c697acc
|
Merge pull request #11977 from kevinz000/xenomorph_balancing_pass
Xenomorph balancing pass
|
2020-04-26 14:03:15 +02:00 |
|
|
kevinz000andGitHub
|
4689e2aeb6
|
Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
|
2020-04-25 16:51:14 -07:00 |
|
|
Ghommie
|
8440b48a9a
|
organ/on_life tweaks.
|
2020-04-25 16:19:43 +02:00 |
|
|
Detective Google
|
71be8ed2fc
|
ports all the tg junk for icemoon, not yet changed to make it all compile
|
2020-04-24 00:02:03 -05:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
LinandGitHub
|
7f271157c3
|
Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
|
2020-04-22 20:33:12 +00:00 |
|
|
Ghommie
|
63870cc9d1
|
Movespeed modifiers refactor port.
|
2020-04-22 22:01:39 +02:00 |
|
|
kevinz000
|
5984fa02b8
|
more changes
|
2020-04-22 08:49:21 -07:00 |
|
|
kevinz000
|
d259519bff
|
changes
|
2020-04-22 08:31:09 -07:00 |
|
|
kevinz000
|
0eac988f52
|
okay!
|
2020-04-22 08:22:52 -07: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 |
|
|
kevinz000andGitHub
|
ae27bf90e4
|
Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
|
2020-04-19 16:45:44 -07:00 |
|
|
LinandGitHub
|
8d8a0b0f45
|
Merge pull request #11899 from Ghommie/Ghommie-cit686
Fixing some more mistakes I did to clothing.
|
2020-04-19 00:24:29 +00:00 |
|
|
Ghommie
|
e3fb978465
|
Shielded element.
|
2020-04-19 01:48:51 +02:00 |
|
|
Putnam
|
33039f9962
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
|
2020-04-17 18:56:26 -07:00 |
|
|
LinandGitHub
|
7cc7d6884a
|
Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
|
2020-04-17 20:45:40 +00: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 |
|
|
kevinz000andGitHub
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
|
GhomandGitHub
|
bceca18626
|
Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
|
2020-04-16 19:04:16 +02:00 |
|
|
GhomandGitHub
|
747672eb50
|
Update update_icons.dm
|
2020-04-16 16:44:07 +02:00 |
|
|
Ghommie
|
42b67d9240
|
PR is ready.
|
2020-04-16 16:33:04 +02: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 |
|
|
kevinz000andGitHub
|
e533103ed2
|
Merge branch 'master' into shield_bashing
|
2020-04-15 19:34:08 -07:00 |
|
|
necromanceranne
|
61df831216
|
also makes martial artists spend stamina on disarm aaah
|
2020-04-15 20:07:01 +10:00 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +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 |
|
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Ghommie
|
571584901c
|
Custom skin tone preferences.
|
2020-04-14 19:10:28 +02: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 |
|
|
Putnam
|
1e8fffbf0b
|
Replaced all the extraneous flags with bitflags
|
2020-04-13 16:47:43 -07: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 |
|
|
kevinz000andGitHub
|
105d405d2d
|
Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
|
2020-04-12 22:34:45 -07:00 |
|
|
kevinz000andGitHub
|
d6544af144
|
Update status_procs.dm
|
2020-04-12 22:25:46 -07:00 |
|
|
Ghommie
|
0d0f14d3f8
|
Item color removal port fixes.
|
2020-04-13 03:34:58 +02: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
|
8604297dcd
|
Merge pull request #11811 from Ghommie/Ghommie-cit671
Fixes and standarizes a few liver troubles. Re-enables liver failure.
|
2020-04-12 17:01:50 -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 |
|
|
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 |
|