cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,451 Commits 9 Branches 0 Tags
1b4cc6b555d310b51e59c24e382eb18e3d94a280
Commit Graph

81 Commits

Author SHA1 Message Date
Casey
7be78d396e Merge pull request #12375 from GhostActual/vaporwave-dreams 
Vaporwave Dreams
 2022-03-07 03:06:16 +00:00
Casey
9163ddb85b Renames Engineer, new alt-titles for Stellar Delight 2021-12-12 08:46:53 +00:00
Nadyr
a268fc233d powder that makes you say yes 2021-09-27 18:00:49 -04:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Nadyr
20ece9d83c Merge pull request #2914 from CHOMPStationBot/upstream-merge-11502 
[MIRROR] [MIRROR] Adds Qipaos
 2021-08-26 23:06:36 -04:00
Chompstation Bot
3b8eef18e7 [MIRROR] Adds Qipaos 2021-08-26 20:42:16 +00:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
6f129e8dc2 Port some more clothes from CitRP + updates 'off' sprite for mesons & co to match new style. 2021-08-24 23:58:34 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
fad5c08958 [MIRROR] Yet another clothing PR 2021-03-10 19:40:27 +00:00
Novacat
fb2db44754 Merge pull request #9528 from Tenryumi/fluff-skirt-outfit-blacklisting 
Adds fluff skirt outfits to loadout blacklist
 2020-12-28 18:24:26 +00:00
Verkister
270aa28416 Merge pull request #9290 from VOREStation/upstream-merge-7751 
[MIRROR] Ports some clothing from uristcode
 2020-11-08 06:58:52 +00:00
Verkister
fb1b3d210e Merge pull request #9241 from VOREStation/upstream-merge-7733 
[MIRROR] 5 new clothes & 1 headdress
 2020-10-19 10:36:41 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Atermonera
f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout 
adds the ability to give loadout items a custom name/description
 2020-09-04 22:31:18 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Schnayy
f9c3cf616e Clothes, clothes, clothes! 2020-07-31 04:02:49 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Schnayy
4cf5f95991 Clothes! (And rats) 2020-07-22 06:13:29 -04:00
Killian
8d2ec5f7fa loadout comments, improved warden/hos access modification 2020-03-17 15:44:23 +00:00
Killian
8b9f5e949a security pilot basics 2020-03-17 15:11:28 +00:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Atermonera
28a1d8669c Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck 
Psychiatrists can now properly get the medical turtleneck via loadout
 2020-01-15 23:09:19 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Atermonera
de27063ae1 Merge pull request #6334 from Schnayy/clothingpack1 
New Clothing & Sweaters
 2019-07-27 15:09:11 -04:00
Hawk_v3
124afe1cbc Merge remote-tracking branch 'upstream/master' 2019-07-07 18:41:28 +01:00
Heroman
2c11586f7d Fixes some personal fluff items being selectable in loadout 2019-07-05 09:58:27 +10: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
mistyLuminescence
26ead98d6f Loadout item role tweaks (#5998) 
* Loadout ItemRoles tweak
 2019-03-30 04:10:16 -04:00
Atermonera
bf7686cd02 Merge pull request #5992 from mistyLuminescence/turtlenecks 
Departmental Turtlenecks
 2019-03-08 01:45:09 -05:00
Cerebulon
0be6662dc5 Adds 12 new futuristic loadout clothing items + colour variants 2018-12-06 16:17:20 -05:00
Hawk_v3
eac48b5283 Merge remote-tracking branch 'upstream/master' 2018-10-24 22:07:16 +01:00
Shophaune
7266f28757 Fix for duplicated loadout descriptions (#5694) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.
 2018-10-21 14:23:59 -04:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Dwaggy
6a8ac4c3d4 Blueshield update/oversight 
So..blueshield in loadout wise is a mix of command and security gear.
So..i've (finally) added Blueshield Guard to anything that was restricted to either "security officer", or to the 'entire list of command staff'.
this allows BSG's to take holsters, Sec huds, and the PMC coats and all that, along with coats that are usually in sec/command only for loadout choices..

What this doesn't mean is you can take the hat that only the CD or HoS has. those are still locked. I specifically  looked for the two above criteria for access restrictions.

This is something that was long due and forgotten about in the midst of everything else.
 2018-09-25 01:23:52 +01:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Schnayy
36236e1883 Sivian Western Sprite Pack (#4970) 
* Adds: flamenco dress, bustle dress, cowboy duster, sheriff badge, tiny cowboy hat. To be added: 2 pairs of cowboy boots, stick horse.

* Adds 2 cowboy boots and a stick horse. yeehaw.

* Attempting to squash conflict that was caused by one of my OWN prs. For shame.

* attempting to fix conflict ft. anewbe
 2018-02-27 14:24:20 -06:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid 
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
 2017-12-12 19:51:35 -06:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -05:00
Belsima
2d3a306dea Loadout additions + fixes. (#4339) 
* Loadout additions + fixes.

* Selection fix.
 2017-11-27 19:21:49 -06: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
Belsima
fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
MatchaFrappe
68310de0ae Update loadout_uniform.dm 2017-06-05 17:06:32 +10:00
Schnayy
b1cb74b318 Adds 4 new clothing sprites & puts them in the loadout. 
Peacoats: Requested.

Black corset/skirt combo: Requested.

Flower dress: First ss13 sprite I made, threw it in.

Red swept dress: A new, nicer red dress.
 2017-05-22 18:08:01 -05:00
Cerebulon
0ce6ca7290 Cleans up uniform loadout menu. 
Suits are now mostly under one-piece (subtypes of 'lawyer') and modular (subtypes of 'suit_jacket') selection menus. Croptops also under selection menu.
 2017-05-08 00:31:31 +01:00