cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,141 Commits 10 Branches 0 Tags
db38ed93c0d04d1d218669779e0a034daf872d01
Commit Graph

79 Commits

Author SHA1 Message Date
Heroman3003
db38ed93c0 Spell Fixes 2023-06-19 04:40:45 +00:00
Heroman3003
feebcbac94 Merge pull request #14886 from KillianKirilenko/kk-fashion 
New Poncho Style
 2023-05-25 02:11:24 +00:00
Heroman3003
c7827b37fb Merge pull request #14446 from Hatterhat/outfit-pass2 
skyrat outfit port continuation (adds to loadout)
 2023-02-08 03:13:42 +00:00
Casey
b2912331b5 Merge pull request #14418 from Flump1/master 
Ports four outfits from skyrat
 2023-02-04 05:37:57 +00:00
Heroman3003
c05f0c3291 Merge pull request #14329 from KillianKirilenko/kk-masks 
More Gaiter Masks
 2023-01-13 21:57:08 +00:00
Casey
da9722545b More casino updates 2022-08-21 19:38:41 +00:00
Casey
061b177978 Mini Aurora Port 2022-04-04 18:07:58 -04:00
Casey
4f457c2dc0 Show off your Pride 2022-03-21 09:55:24 +00:00
Casey
3c89650556 Merge pull request #11755 from Hatterhat/gaiter-second-pass 
neck gaiter second pass - thank you @dan
 2021-12-10 06:24:31 +00:00
Chompstation Bot
3d2783aec7 Ports new Bay SolGov suits as Commonwealth suits 2021-07-15 19:29:34 -04:00
Chompstation Bot
16a731dd39 Move like every clothing icon file 2021-07-10 16:23:23 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Atermonera
e79819146f Accessory colors aren't modified by clothing colors (#7435) 2020-08-12 21:31:56 -04:00
Greenjoe12345
ba3505fbd2 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 14:17:08 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04:00
lbnesquik
00dae38d6c Make it so the stethoscope doesn't pick up vore & stuffing by listening to people feet or something. 2020-01-22 09:38:50 +01:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Unknown
5dd8153c19 Ports Polaris PR 2019-05-02 21:01:07 -04:00
Unknown
d22f668012 Fixes Part Two 2019-05-02 03:47:11 -04:00
Unknown
36ec23b377 Ports https://github.com/PolarisSS13/Polaris/pull/6140 2019-05-01 20:47:03 -04:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
elgeonmb
9d056decda Adds the Zaddat Race + Modifies pressure damage calculations 2019-03-28 16:54:32 -04:00
Hawk_v3
61ad1228e1 Fixes Stethoscope runtimes 
Check for human too, so it doesn't get confused when you try to listen to simple mobs or items or... Anything else. NB: It doesn't tell you if there are simple animals inside a person.
 2018-11-07 21:19:40 +00:00
Aronai Sieyes
1e4d8ed383 Revert "Revert "Stethoscope vore shitpost"" 
This reverts commit 7c522fc0c4.
 2018-10-24 22:28:13 +01:00
Aronai Sieyes
7c522fc0c4 Revert "Stethoscope vore shitpost" 2018-10-20 17:43:06 -04:00
lbnesquik
d8fd7ea6ac Update to listen to the reviews 2018-10-15 16:34:55 +02:00
lbnesquik
cb501e395d Please review 2018-10-13 09:28:27 +02:00
Kates
d1749b5981 Update accessory.dm 2018-10-09 07:29:44 +02:00
Kates
cb23bd95d4 Update accessory.dm 2018-10-09 07:29:02 +02:00
Kates
07bb2f0d1c Update accessory.dm 2018-10-06 09:57:38 +02:00
Kates
fa7ee8e015 Update accessory.dm 2018-10-06 09:39:45 +02:00
lbnesquik
db7fd37769 stethoscope shitpost. 
Add some small vore feature.
 2018-10-06 09:31:27 +02:00
Arokha Sieyes
80ffd86b0e Change accessories to use bitflags 
Allows accessories to 'block' multiple slots
 2018-05-22 15:55:22 -04:00
Verkister
94c9d631f9 Fixes custom accessories not showing up on things 
Contradictory hardcoding babe.
 2018-03-24 14:24:44 +02:00
Anewbe
5212fa152b Species names should now use defines 2018-03-15 20:24:45 -05:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
mistyLuminescence
fc6ef8e921 Fixes hand sprites 2017-11-18 02:42:55 +00:00
mistyLuminescence
0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Verkister
26ea6ec92d Enables the combo blend mode for most colorable loadout gear. 
-The most meaning the colorable uniforms, suits, gloves, shoes, headgear, earwear, and accessories.
-Only affects mob icons for now, the inventory/floor icons still in old blend.
-Sort of a framework for possible additional options to come.
-Also messed around with some other stuff such as adding on-ear icons to the rest of the flower pins and bows, and made the base icons for the beanies lighter than the middle gray they were.
 2017-11-02 15:33:52 +02:00
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
Nerezza
733f908799 Accessories on teshari now use the right sprites 
Teshari can (finally) into webbing, too!

Tested and works, only issue is that any accessories not in seromi/ties.dmi will not be visible. This is how everything but jumpsuits handles things for them anyhow.
 2016-11-19 13:15:14 -06:00