cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,040 Commits 55 Branches 0 Tags
562b57095da3e36e24bc768d3cc1b83c5d1e964d
Commit Graph

2301 Commits

Author SHA1 Message Date
Putnam3145
c20c7f0698 Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177) 
* Removes crocin, hexacrocin from emagged booze dispenser

* what. what. what. what. what.
 2020-05-09 14:34:30 +02:00
kevinz000
407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000
19072abe37 compile 2020-05-08 23:01:05 -07:00
Ghommie
2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie
a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Ghommie
192c0dcc1a Demodularizing the arousal module. 2020-05-08 03:35:29 +02:00
Putnam3145
e36bd50ad9 Makes G gluid calcs only happen when it's required (#12095) 
* Made G fluid calcs only happen on moment it's required.

* whoops

* Update modular_citadel/code/modules/arousal/organs/testicles.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-04 05:08:01 +02:00
Ghommie
592198d659 Makes privates not spew around upon disembowelment or gibbing. 2020-05-02 20:01:54 +02:00
kevinz000
e6e2277634 Update damage_procs.dm 2020-04-30 01:07:40 -07:00
kevinz000
3d116f5e7e Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr 
Fuck Ranged Security Knockdowns: The Taser Nerf PR That Will Get Me Killed By A Witchhunt
 2020-04-29 12:01:33 -07:00
Lin
19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711 
organ/on_life tweaks.
 2020-04-29 01:15:02 +00: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
a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 
reagents value nerf and standardization.
 2020-04-25 16:54:14 -07:00
kevinz000
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
ZeroMan
f65dfc4994 actual two hit ko 2020-04-25 08:19:34 -04:00
ZeroMan
883b932a48 i will eliminate security 2020-04-23 22:28:50 -04:00
Ghommie
a97c2f66a5 Putnam's suggestions. 2020-04-24 03:44:12 +02:00
Ghommie
0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +02:00
Trilbyspaceclone
3e0519455a Update sylvan.dm 2020-04-23 03:34:38 -04: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
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +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