cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,402 Commits 5 Branches 0 Tags
0160eb3e6849cc8ed6b6bed0095d9502b413f272
Commit Graph

97 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
ef69953320 [MIRROR] Adds more lost clothes to the loadouts (#10619) 
Co-authored-by: TheToaster98 <51209769+TheToaster98@users.noreply.github.com>
 2025-04-10 01:08:25 +02:00
CHOMPStation2StaffMirrorBot
ca9b47057c [MIRROR] Makes a few loadout fluff items NOT give you 50% armor (#10463) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-24 11:20:52 +01:00
CHOMPStation2StaffMirrorBot
789db280cc [MIRROR] space cleanup (#10414) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-15 00:47:51 +01:00
CHOMPStation2StaffMirrorBot
fecffcf15b [MIRROR] Update & Cleanup Loadouts (#9877) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-17 16:46:55 +01:00
CHOMPStation2StaffMirrorBot
20afa499ec [MIRROR] Bunny suits (#9331) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-27 18:24:53 +01:00
CHOMPStation2
4153768ba1 [MIRROR] Job rank and radio channel rework (#8965) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-09-17 21:24:13 +02:00
CHOMPStation2
dbb4138836 [MIRROR] yet another clothing port pr (#8665) 
Co-authored-by: dan <75939194+PastelPrinceDan@users.noreply.github.com>
 2024-07-22 15:43:14 +02:00
CHOMPStation2
495411c4a4 [MIRROR] tanktop to loadout, yellow jacket to loadout (#7589) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-01-19 10:35:34 +01:00
CHOMPStation2
ddd5152508 [MIRROR] underwear & clothing sprite fixes + edits (#7408) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-12-13 09:50:25 +01:00
CHOMPStation2
a4f5f51da3 [MIRROR] porting extravanganza - hair, clothes + 1 tail (#7340) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-12-06 21:04:13 +01:00
Aroliacue
9eb6ca21e1 More Skinsuits (#6900) 2023-09-02 16:47:17 +12:00
Heroman3003
f4ec2e5922 ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat 2023-07-01 20:25:47 +00:00
Raeschen
de6a048679 fix merge conflicts 2023-06-19 11:48:24 +02:00
Heroman3003
617e2e55b9 Loadout Overhaul 2023-06-18 18:47:29 +00:00
Casey
f0dbb2b415 Merge pull request #14184 from DigitalSquirrel95/patch-7 
Removes job requirement from Bartender Skirt
 2022-12-09 23:43:24 +00:00
Casey
a3ff8fc3b5 Adds Altevian fashion 2022-08-17 20:10:23 +00:00
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