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

2229 Commits

Author SHA1 Message Date
ZeroMan
883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghom
6679d13509 Merge pull request #11939 from Owai-Seek/weight-class-4-19-20 
Reduces weight classes of several items.
 2020-04-20 23:53:07 +02:00
Ghom
850c08cb0e Merge pull request #11894 from NopemanMcHalt/trek_tmp 
Adds not-so-great TMP-era trek utility uniform, also fixes loadout restriction descs
 2020-04-20 02:21:24 +02: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
b8ff1b16bd Better. 2020-04-19 17:28:07 -04:00
Winter Flare
8e3f48a761 Reduces (or gives) weight classes to several items. 2020-04-19 17:13:19 -04:00
Anonymous
64116857cf Merge branch 'master' into trek_tmp 2020-04-18 16:34:21 +03:00
Ghom
775948eed3 Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6 
Shuffles around and buffs resisting embedded objects
 2020-04-18 05:34:58 +02:00
Putnam
d90e490bae Aaand updated with master 2020-04-17 18:57:36 -07:00
kappa-sama
e19f9c5c3e revert 2020-04-17 19:19:00 -04: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
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
4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683 
Fixing some dog tier issue.
 2020-04-17 05:40:50 -07:00
kevinz000
d1d3c1f773 Merge pull request #11880 from NopemanMcHalt/benohybrid-screem 
Allows xenohybrids to scream like xeno would
 2020-04-17 05:39:54 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07: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
Ghom
eb48e00bcb Merge pull request #11805 from kevinz000/damage_procs_lite 
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
 2020-04-16 19:05:34 +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
Anonymous
9d6f013bde Makes Xenohybrids scream Xeno 
Because if they can hiss like xeno, why not screem like one?
 2020-04-16 14:23:16 +03:00
Ghommie
7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
kevinz000
b69c0944c9 Update human.dm 2020-04-14 21:54:23 -07:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Ghom
5d01e05991 Merge pull request #11618 from Arturlang/Garlic 
Adds garlic, and tweaks bloodsuckers a bunch.
 2020-04-14 12:38:34 +02:00
kevinz000
f460d0dab0 Merge pull request #11831 from Ghommie/Ghommie-cit677 
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
 2020-04-14 01:33:57 -07:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03: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
kevinz000
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
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
Ghommie
2e2b9cfe1b Fixing some sprite accessories offsets, shifted the icon states 2 px down. 2020-04-12 09:13:44 +02:00
kevinz000
4e99c6bb28 Update damage_procs.dm 2020-04-11 08:24:57 -07:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Ghommie
af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
kevinz000
ca45514444 typos 2020-04-09 21:55:54 -07:00
kevinz000
3bfc62fbb9 dmg 2020-04-09 21:55:02 -07: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
22bf4cdb83 Merge pull request #11760 from Trilbyspaceclone/10mmchanges 
Stechkin and ASP ammo boxes in uplink and ASP ammo boxes
 2020-04-09 02:38:44 -07:00
Lin
c2cbad81dd what the fuck 2020-04-08 19:00:18 +00: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
TrilbySpaceClone
2cd59a6fb0 that was easy 2020-04-06 08:40:34 -04:00
Putnam3145
70cd562b36 Merge pull request #11720 from Trilbyspaceclone/patch-328 
Corrects missing slash in a bullet
 2020-04-04 01:02:32 -07:00
Ghommie
56669f9296 Minor snowflakes clothing variations refactor. Removal of copypasted states. 2020-04-04 00:22:18 +02:00
Ghommie
58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02: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
Trilbyspaceclone
3948214380 Update handguns.dm 2020-04-02 09:18:37 -04:00
Artur
a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03:00
Ghommie
e26b43d80b The banishment of the floating disembodied phallus. 2020-03-31 02:40:28 +02:00