cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,654 Commits 10 Branches 0 Tags
nanomaps_generation
Commit Graph
1338 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
CHOMPStation2StaffMirrorBotGitHubWillCameron Lennox
 		d884536046 [MIRROR] Remote view fix again (#12792) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-05-28 01:22:45 -04:00
KashargulandGitHub d75f90466d removes all var/ in procs (#12738) 2026-05-05 10:55:04 +02: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
 		506f34c3f2 [MIRROR] Flammable Items, Abstractness, and hypnosis (#12672) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-04-13 01:47:28 -04:00
CHOMPStation2StaffMirrorBotGitHubWillCameron Lennox
 		90d7e7d352 [MIRROR] Move autolathe design datums to techweb datums (#12565) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2026-03-21 03:53:42 -04:00
CHOMPStation2StaffMirrorBotGitHubWill
 		1bccee7382 [MIRROR] fix missing gift icons (#12495) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
 2026-03-09 00:27:51 +01:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		acd4f1c387 [MIRROR] Convert some more globals (#12482) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2026-03-03 01:11:36 +01: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
CHOMPStation2StaffMirrorBotGitHubWill
 		953250b06a [MIRROR] Relaymove Moved To Remote Views (#11914) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
 2025-11-05 18:56:44 -05:00
CHOMPStation2StaffMirrorBotGitHubNickBelmont
 		2a06204091 [MIRROR] Fixes Stock Part Benchmark Experiment Exploit (#11847) 
Co-authored-by: NickBelmont <89628295+NickBelmont@users.noreply.github.com>
 2025-10-21 19:14:01 +02:00
CHOMPStation2StaffMirrorBotGitHubWillCameron Lennox
 		7d57273375 [MIRROR] Fixing client eye (#11812) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-10-12 22:44:25 -04:00
CHOMPStation2StaffMirrorBotGitHubCameron Lennox
 		8fa48e2a3e [MIRROR] Fixes map issues found in #18285 [MDB IGNORE] [IDB IGNORE] (#11485) 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-08-23 22:23:45 +02:00
CHOMPStation2StaffMirrorBotGitHubShadowLarkensCameron Lennox
 		c734e2791b [MIRROR] Add a very simple bluespace RPED (#11053) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-06-13 09:17:25 +02:00
CHOMPStation2StaffMirrorBotGitHubGutiKashargul
 		4558eaab04 [MIRROR] Soap & clean proc refactor (#10989) 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-06-02 19:18:12 +02: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
 		ad0915a957 [MIRROR] some more new to init (#10270) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-02 02:31:24 +01:00
CHOMPStation2StaffMirrorBotGitHubKashargul
 		a3ac1d26d7 [MIRROR] bunch of inits without return and a few easy new to init (#9773) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-01-03 19:06:49 +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
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
DrathekGitHubRaeschen
 		3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CaseyandCHOMPStation2 1d3e58a5a9 Merge pull request #13895 from KillianKirilenko/kk-randomsoap 
Random-Soap Addon
 2022-10-16 21:02:50 +00:00
CaseyandCHOMPStation2 557371a7f5 Merge pull request #13868 from VOREStation/upstream-merge-8726 
[MIRROR] Rub A Dub Dub [READY FOR MERGE]
 2022-10-10 03:07:29 +00:00
CaseyandDarlantan 3add9b1880 The Grand /TG Port - Part 1 2022-04-04 16:50:53 -04:00
CaseyandChompstation Bot 175bc573fe A Miner Update [forgot to test a thing] 2021-12-10 00:50:47 +00:00
NadyrandDarlantan 18b634d803 powder that makes you say yes 2021-10-27 21:05:26 -04:00
Chompstation BotandDarlantan 3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Chompstation Bot 481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot 287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
NovacatandChompstation Bot 6127c5d2e9 Merge pull request #9455 from VOREStation/upstream-merge-7784 
[MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
 2020-12-14 03:05:22 +00:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
CerebulonandVirgoBot 95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -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 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
listerlaandVirgoBot c63d6c5777 Adds wearing cones and caution signs (#7466) 
* Adds wearing cones and caution signs

* Fixes quarantine shuttle PoI

* Create Lorilili - janiwear.yml
 2020-08-17 12:59:40 -04:00
SplinterGP 8e8aac4be1 adds RPED sprite in hand 2020-05-20 22:50:35 -03: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
AtermoneraandVirgoBot 77fef98789 Merge pull request #7010 from atlantiscze/2020_04_17_LoadBalancing 
Ports over power-related enhancements and tweaks i coded for Bay a while back
 2020-05-03 18:45:25 -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
AtermoneraandVirgoBot 027028b314 Repaths collapsible white canes to not anger beepsky 2020-03-25 16:39:18 -04:00
AtermoneraandVirgoBot 8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Repede c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Aronai Sieyes 967fd17048 Rename to discs_vr.dmi and correct copypaste error 2020-02-29 10:37:41 -05: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
Aronai Sieyes b3b51a7c3a New sprites for discs with unique colors 
Now every disc has a unique color rather than most of them being the same and all of them being in cloning.dmi.

Sprites from CEV-Eris.
 2020-02-20 21:37:15 -05:00
Greenjoe12345andVirgoBot 3391de2f42 canes and crutches (#6694) 
* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider
added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout

* Edited white cane inventory/ground sprite, and changed in-hand sprites to ones from Yawn Wider

added a telescopic cane, ported from Yawn Wider (credit to gozulio)
ported the crutch item from world server
both new items were added to loadout
also fixed config.txt fuckup

* fixed a spelling error
 2020-02-19 14:34:41 -05:00
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00