cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,679 Commits 13 Branches 0 Tags
nanomaps_generation
Commit Graph
86 Commits
Author SHA1 Message Date
CHOMPStation2StaffMirrorBotGitHubGutiCameron Lennox
 		435bb3079d [MIRROR] Makes material costs use sheets amount define (#12887) 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-07-09 19:17:37 -04:00
KashargulandGitHub d75f90466d removes all var/ in procs (#12738) 2026-05-05 10:55:04 +02:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		afcea67115 [MIRROR] Gripper fixes (#12714) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-04-26 21:53:22 -04:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		966e4accb2 [MIRROR] Magboot and glove fix (#12686) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-04-16 12:29:20 -04:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		bb3778d69d [MIRROR] Clears unused research var (#12685) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-04-14 22:07:55 -04:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		3cac28f9ad [MIRROR] Begin clickcode attack_self fix (#12173) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-12-29 15:51:44 -05:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		c50f4d228f [MIRROR] fix robot multibelts tgui usage (#11980) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-11-14 19:13:20 -05:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		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
CHOMPStation2StaffMirrorBotGitHubShadowLarkensCameron Lennox
 		9f292671ae [MIRROR] Port /datum/status_effect and convert wetness and fire stacks to it (#11666) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-09-17 14:21:49 +02:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		938e760841 [MIRROR] Gets rid of hasvar usage and moves up some vars (#11484) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-23 13:04:52 -04:00
CHOMPStation2StaffMirrorBotGitHubCameron LennoxKashargul
 		9d57e72903 [MIRROR] Multibelt fixes and QoL (#11125) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-06-29 04:53:48 +02:00
CHOMPStation2StaffMirrorBotGitHubCameron LennoxKashargul
 		f7e20d021e [MIRROR] Better borg modules (#11095) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-06-20 22:04:56 +02:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		ff63262b79 [MIRROR] Makes FBP not go blind from welders (#10707) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-04-22 00:53:19 +02:00
CHOMPStation2StaffMirrorBotGitHubCameron LennoxWillburdKashargul
 		98519f0f45 [MIRROR] Flamethrower TGUI + Tweaks (#10479) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-21 00:08:55 +01:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		ce2446922e [MIRROR] Initialize fixing (#10335) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-08 22:22:04 +01:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		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
CHOMPStation2StaffMirrorBotGitHubKashargul
 		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
CHOMPStation2StaffMirrorBotGitHubHeroman3003Kashargul
 		fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-12 02:11:06 +01:00
CHOMPStation2StaffMirrorBotGitHubHeroman3003Kashargul
 		0180cc74c5 [MIRROR] usr to user up to player effects (#9552) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-12-01 18:31:19 +01:00
CHOMPStation2GitHubKashargulKashargul
 		7416cbea22 [MIRROR] next set of spans (#9247) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
 2024-10-18 01:33:07 +02:00
CHOMPStation2GitHubHeroman3003Kashargul
 		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
CHOMPStation2GitHubChangelogsHeroman3003GutiKashargulKashargul
 		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
CHOMPStation2GitHubHeroman3003Nadyr
 		d2e66e6410 [MIRROR] Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one (#7062) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
 2023-10-04 18:37:41 -04:00
Heroman3003andCHOMPStation2 092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +00:00
CaseyandCHOMPStation2 76280d914e Medical tweaks and Medical Malpractice 2022-10-10 02:58:53 +00:00
Chompstation Bot 0fc8ba9656 Tool Time (Fixed) 2021-10-27 16:02:47 +00:00
Chompstation Bot 287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot 14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Chompstation Bot 55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation BotandDarlantan d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Chompstation Bot ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
VerkisterandChompstation Bot a8aedccb38 Merge pull request #9276 from VOREStation/upstream-merge-7753 
[MIRROR] No more unnearsightedness!
 2020-11-05 10:06:02 +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
Shadow Quill eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112 e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
AtermoneraandVirgoBot b82b05409f Merge pull request #7172 from lolman360/hyBRO-tools 
Hybrid tools buffs.
 2020-05-21 14:32:45 -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
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
Aronai Sieyes 57f28af1fd Prevent protean repairs using fire and cables 
Doesn't make much sense
 2020-04-27 11:18:03 -04:00
Erik eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07: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
AtermoneraandVirgoBot 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
NovacatandGitHub 3c06d62345 Update weldingtool.dm 2020-03-08 03:25:18 -04:00