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
78,752 Commits 5 Branches 0 Tags
ab154b48b21445834aa64b51d59396be6efe229b
Commit Graph

395 Commits

Author SHA1 Message Date
CHOMPStation2
ab154b48b2 [MIRROR] refactors most spans (#9139) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-04 15:00:17 +02:00
CHOMPStation2
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084) 
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-09-30 21:36:41 +02: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
Raeschen
e96964a51d Statpanel + holder runtimes (#8098) 2024-03-29 14:06:04 +01:00
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
2ec2899f22 [MIRROR] Ports various clothing items, two sets of cyberlegs & some markings (#7695) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-09 12:21:39 +01:00
CHOMPStation2
2878ad68de [MIRROR] adds 18th century oufit, ports fox ears, fixes 2 hairs (#7696) 
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2024-02-07 19:40:54 +01:00
WinterDarkraven
2250575937 Adds "Holographic Demonic Halos" (#7258) 2023-11-24 00:00:37 +01:00
Verkister
ccb4aad376 Slow digestion for food items, Swoopie succ overhaul, and a couple other fixes. (#7029) 2023-09-26 15:48:01 +02:00
Razgriz
d52dc4bd84 Fix shiny modular clothes and adds a bunch of fun items to hidden crate on deck 2 (#6918) 2023-09-04 10:32:53 +02:00
Heroman3003
f4ec2e5922 ports some clothing from citadel rp + 2 hairs & 2 gradients from skyrat 2023-07-01 20:25:47 +00:00
Heroman3003
7162053d20 Merge pull request #15085 from Heroman3003/classic-hardhat 
Brings classic hard hats as alternate option
 2023-06-26 20:20:27 +00:00
Heroman3003
617e2e55b9 Loadout Overhaul 2023-06-18 18:47:29 +00:00
Heroman3003
b31bdcc957 adds a smattering of clothes sourced from SR & TG 2023-05-21 23:49:31 -04:00
Heroman3003
27870775fc Merge pull request #14856 from Youtubeboy139/mr_bill_softcap_fix 
Fixes the Major Bill's Shipping Softcap
 2023-05-19 19:04:41 +00:00
Nadyr
53575d02f9 powder that makes you say yes 2023-04-30 22:18:29 -04:00
Heroman3003
d1460c5713 Added striped dungarees and tiny tophat 2023-05-01 00:58:13 +00:00
Casey
d8eb1c3be9 Merge pull request #14769 from Heroman3003/pizzatime 
Fixes pizza guy visor
 2023-04-10 00:55:29 +00:00
Sharkmare
a240988a57 Changes the loadout description for Rabbit ears 
Adjusts the loadout description for rabbit ears because the original one is cringe.
 2023-03-09 22:23:22 +01:00
Heroman3003
be56ab7289 Even more sprites including decent hoodies 2023-02-18 19:57:09 +00:00
Razgriz
6b79bc97a7 Merge pull request #5697 from CHOMPStation2/upstream-merge-14470 
[MIRROR] Cloaks, undies, the Antediluvian, and some other bits
 2023-02-12 18:59:42 -07:00
Heroman3003
358e8e9fa2 Cloaks, undies, the Antediluvian, and some other bits 2023-02-11 19:10:39 +00:00
Heroman3003
0a07539d01 Merge pull request #14469 from Seris02/teshbranch 
All the tesh winter coats
 2023-02-10 09:16:05 +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
fb5208d1b3 Merge pull request #14285 from Detective-Google/halos 
adds halos to loadout
 2023-01-04 19:33:39 +00:00
Nadyr
b594174376 powder that makes you say yes 2022-11-21 23:04:46 -05:00
Casey
824a11ff36 Gives teshari missing hat + mask sprites. 2022-11-21 01:33:05 +00:00
Casey
6b40e7118c Merge pull request #13919 from FunnyCatEnjoyer/FunnyCat2 
Halloween costume update. feat Hotdog and Turnip suits.
 2022-10-16 21:08:41 +00:00
Casey
f0efe74732 Merge pull request #13283 from faaaay/master 
Adds recolourable hoodies with functional hoods
 2022-07-08 00:29:44 +00:00
Novacat
f4a3f4f420 Merge pull request #12963 from Heroman3003/hairnet 
Fixes hairnet having no icon
 2022-05-13 23:52:46 +00:00
BlackMajor
15ec60f86f Integration Tests, my beloved 2022-04-21 01:54:56 +12:00
Casey
061b177978 Mini Aurora Port 2022-04-04 18:07:58 -04:00
Casey
3e36b02bc2 Merge pull request #12483 from Screemonster/rainbowtrout 
improves fishing hars with VIBRANCY
 2022-03-20 19:44:04 +00:00
Casey
92701d02cb Merge pull request #12345 from Screemonster/iamaloneonthisforsakenearth 
Adds hats to fishing vendors
 2022-02-27 19:24:10 +00:00
Casey
3d6510f3ea Donk Co. Toys 2022-02-19 04:27:50 +00:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs 
Porting a hefty chunk of Citadel mobs.
 2022-01-29 17:09:18 -05:00
Casey
53c4ed7d96 Merge pull request #12040 from PastelPrinceDan/beretfix 
fixes qm beret name
 2022-01-09 01:50:10 +00:00
Nadyr
f4a8e397ff Merge pull request #3298 from CHOMPStation2/upstream-merge-11973 
[MIRROR] Comments out color ranger helmets
 2021-12-12 06:25:01 -05:00
Casey
5cefa8d4e3 department berets (mostly heads tbh) 2021-12-12 04:20:38 -05:00
Nadyr
35b6006c77 powder that makes you say yes 2021-12-12 00:27:27 -05:00
Casey
1709d70f7c Merge pull request #11973 from Heroman3003/ranger-remove 
Comments out color ranger helmets
 2021-12-08 04:17:36 +00:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Chompstation Bot
04835a42c6 Straw Stuff + Fixes 2 2021-10-27 21:53:50 +00:00
Chompstation Bot
4f0b74e375 [MIRROR] :siffet: 2021-10-24 23:49:32 +00:00
Chompstation Bot
ad57dfbb92 Adds more clothing from Polaris and various sources 2021-09-27 18:31:54 +00:00
Rykka
ed798113d9 Compiler Fixes 
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
 2021-09-03 17:22:49 -07:00
Chompstation Bot
3a63117151 Expanding Clothing Options 2021-08-26 15:44:22 +00:00
Chompstation Bot
7957f049af Fulpstation Labcoats 2021-08-25 00:00:09 +00:00