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

4430 Commits

Author SHA1 Message Date
kevinz000
d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller 
More dynamic tweaks
 2020-04-25 17:05:38 -07:00
kevinz000
d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679 
A peeve with random bodies.
 2020-04-25 16:59:07 -07:00
kevinz000
0dc259a985 Merge pull request #11990 from Trilbyspaceclone/patch-357 
Test merge maybe - Buffs space vines
 2020-04-25 16:54:47 -07:00
kevinz000
da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 
code for designs' security level requirements.
 2020-04-25 16:53:48 -07:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 
Movespeed modifiers refactor port.
 2020-04-25 16:51:14 -07:00
Ghom
5ccdc55e42 Merge pull request #11979 from kevinz000/magnetic_harness 
Cybernetic arm implant balance pass (namely: shields)
 2020-04-25 02:47:28 +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
Trilbyspaceclone
83ba5c1b9b Update venus_human_trap.dm 2020-04-23 16:52:24 -04:00
Ghommie
b5abfd9273 thank you dreamchecker. 2020-04-23 14:49:05 +02:00
TrilbySpaceClone
7761990919 soooo this complies but does it work? 2020-04-23 03:13:07 -04:00
TrilbySpaceClone
86abfefa1b still dosnt work 2020-04-23 02:52:07 -04:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie
63f5e101a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700 2020-04-22 22:30:10 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
kevinz000
c551006295 catch dropped 2020-04-22 10:54:42 -07:00
Lin
df4452468a Merge pull request #11932 from Ghommie/Ghommie-cit695 
Some mispelled filepaths.
 2020-04-22 16:09:33 +00:00
Putnam
44925da1d8 Various dynamic tweaks 2020-04-21 20:52:33 -07:00
Ghom
1a9bcddc61 Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020 
Ups Crab Meat from 1 to 4
 2020-04-22 03:31:19 +02:00
Ghom
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
Ghom
c7780bde9e Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5 
Shuffles resist embed higher up on the resist chain
 2020-04-20 22:34:03 +02:00
kevinz000
a984fc5e3d Update living.dm 2020-04-20 11:45:22 -07:00
kevinz000
096a182a84 Update living.dm 2020-04-20 11:44:59 -07:00
kevinz000
ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
Winter Flare
dc5c8fb657 Ups Crab Meat from 1 to 4 2020-04-19 17:00:48 -04:00
Ghommie
98081aa56b Some mispelled filepaths. 2020-04-19 03:15:51 +02:00
Lin
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
Ghom
50ee5b9de5 Merge pull request #11885 from kappa-sama/patch-21 
ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"
 2020-04-18 05:44:53 +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
Putnam
c8ce60c856 Added back some vore default modes. 2020-04-17 18:46:09 -07:00
Lin
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
Putnam3145
6e8f58d945 Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3 
Once upon a time, a based guardian anchored its name to others' minds.
 2020-04-17 09:36:53 -07: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
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
kevinz000
4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683 
Fixing some dog tier issue.
 2020-04-17 05:40:50 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07:00
Ghom
0fb1286042 Update guardian.dm 2020-04-17 08:47:05 +02:00
kappa-sama
21f7a6032d this 2020-04-17 00:50:42 -04:00
Ghom
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
Ghom
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
Ghommie
7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
kevinz000
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