cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 07:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,985 Commits 10 Branches 0 Tags
896094ef9c3b63037aedba786debb6a2ed859a29
Commit Graph

168 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
f7de0bb70b [MIRROR] Start of TG Click Code Port (#12071) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-12-06 03:18:32 -05:00
CHOMPStation2StaffMirrorBot
e98a9f484a [MIRROR] EMP cleanup (#11939) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-11-08 04:48:48 -05:00
CHOMPStation2StaffMirrorBot
303e88c0b2 [MIRROR] obj screen to atom movable screen (#11719) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-09-22 01:04:35 +02:00
CHOMPStation2StaffMirrorBot
ba1065b92e [MIRROR] clean up flags (Requires #11623 Merged First) (#11637) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-14 20:19:32 +02:00
CHOMPStation2StaffMirrorBot
0cd0015f91 [MIRROR] clothing _vr dmi cleanup: eyewear and masks (#11503) 
Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-08-26 13:54:21 -04:00
CHOMPStation2StaffMirrorBot
cc58ddc278 [MIRROR] Rx AR Hud and slight loadout cleanup (#10854) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-05-09 17:07:09 +02:00
CHOMPStation2StaffMirrorBot
6169daa735 [MIRROR] ss atoms update (#10736) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-04-25 08:18:14 +02:00
CHOMPStation2StaffMirrorBot
8d0febfbb6 [MIRROR] next grep, no spaces (#10548) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-29 22:13:04 +01:00
CHOMPStation2StaffMirrorBot
c844cc3dee [MIRROR] Finish Machinery new to init (#10439) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-16 15:44:59 +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
5aad34f339 [MIRROR] Some more Init and Destroy issues (#10317) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-06 12:36:25 +01:00
CHOMPStation2StaffMirrorBot
a245b8687f [MIRROR] usr to user part two (#10015) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-31 22:27:34 +01:00
CHOMPStation2StaffMirrorBot
ed79946ade [MIRROR] some istype to macros (#9802) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-05 23:01:49 +01:00
CHOMPStation2StaffMirrorBot
893b4e2ac0 [MIRROR] converts area booleans to flags (#9595) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-08 15:57:55 +01:00
CHOMPStation2StaffMirrorBot
4e129ceabd [MIRROR] Hides your eyes when wearing blindfolds (#9542) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2024-11-28 08:07:05 +01:00
CHOMPStation2StaffMirrorBot
09f82b6fff [MIRROR] The final action buttons PR (#9324) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-27 00:00:36 +02:00
CHOMPStation2
45025bd128 [MIRROR] Ports tgstation/tgstation/pull/15673 (#9270) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-20 23:08:28 +02:00
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
31407a0be3 [MIRROR] First part of a span rework (#9120) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-02 16:25:48 +02:00
Drathek
aa7cd0f69f Tooling updates and removal of corrupt maps [MDB IGNORE] (#7620) 2024-02-05 18:49:02 -05:00
CHOMPStation2
aab270c74f [MIRROR] remove static chat colour tags (#7635) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
Co-authored-by: Eli <fracshun@gmail.com>
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com>
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com>
 2024-01-29 18:45:19 -05:00
CHOMPStation2
38984e8ef3 [MIRROR] VerySoft Fluff Item! (#7133) 
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-25 20:13:25 -04:00
Heroman3003
5738a980d4 Merge pull request #14926 from Youtubeboy139/Grammar1 
Some Grammar Fixes
 2023-05-31 02:14:24 +00:00
Heroman3003
11c15b1ea1 Merge pull request #14906 from Youtubeboy139/Feel-like-a-Big-Shot 
MY EYES ARE [[Burning]] LIKE [[DVDs of ANY movie at Half-pr1ce!]]
 2023-05-28 02:59:18 +00:00
Casey
c3a0eaaf5b Merge pull request #12242 from GhostActual/bigshot_glasses 
Now's your chance to be a [BIG SHOT]
 2022-02-16 07:21:13 +00:00
Casey
65c253f3fd Merge pull request #11711 from GhostActual/eye_see_you 
Eye See You
 2021-10-27 16:12:46 +00:00
Nadyr
5f6401fbae powder that makes you say yes 2021-07-12 22:30:06 -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
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Nadyr
b560f4a5c0 Update glasses.dm 2021-03-30 01:07:24 -04:00
Chompstation Bot
1ad694dcf0 [MIRROR] Repathed/renamed seromi to teshari. 2021-03-28 21:33:04 +00:00
Novacat
3954bedb9d Merge pull request #9606 from VOREStation/upstream-merge-7834 
[MIRROR] fixes some sprites, adds a thin blindfold
 2021-01-25 03:09:35 +00:00
Chompstation Bot
7b30714172 [MIRROR] Adds & Upgrades a Bunch of Teshari Clothing 2020-12-04 20:07:48 +00:00
cadyn
c23558a35d More conflicts yay 2020-11-21 18:51:16 -08:00
Chompstation Bot
2e15527ef0 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings 2020-11-20 15:44:21 +00:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Atermonera
123a0fd115 Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch 
Teshari sprites and white eyepatch
 2020-09-26 16:58:44 -04: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
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Atermonera
c889e5ebe2 Adds Area-Based Meson Obfuscation 2020-08-02 00:05:29 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Aronai Sieyes
c93c5afefa Adds atom/movable cloaking framework 2020-03-23 21:34:32 -04:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
SplinterGP
f1e2bc6fd9 Fixes //ywedit on the lists 
title
 2020-02-07 21:11:14 -03:00
SplinterGP
1452ac0749 adds YW edits and lists them on suit cycler correctly 
Title
 2020-02-07 20:41:01 -03:00