cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-01 20:30:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,064 Commits 6 Branches 0 Tags
968556d96cba3fec00a940807bc9836533caa71e
Commit Graph

32 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot 747ed116c6 [MIRROR] Reagent Refinery (#11282) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-08-02 12:08:35 +02:00
Kashargul 5a04ab175d cleans up some of the old << in favor of to_chat (#11156) 2025-07-08 21:25:03 +02:00
CHOMPStation2StaffMirrorBot 5853b61b55 [MIRROR] New to init final (#10649) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-04-17 13:52:07 +02:00
CHOMPStation2StaffMirrorBot e501986575 [MIRROR] only tab indentation (#10517) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-24 01:30:43 +01:00
CHOMPStation2StaffMirrorBot 848d52a683 [MIRROR] Recipie conflict unit test + Chemanalyzer PRO (#10494) 
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-22 19:23:35 +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 3cfc33bfde [MIRROR] ports a bunch of grep checks from TG (#10361) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
 2025-03-12 11:09:38 +01:00
Kashargul 801238f4d2 [Manual Port] of #16707 Enable define sanity (#9651) 2024-12-16 23:31:49 +01:00
CHOMPStation2StaffMirrorBot 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
Kashargul fe4b5ec2cb finish up the spans (#9605) 2024-12-09 22:51:05 +01: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
Kashargul e28fa96705 Tg panel patch 2 (#8085) 
Co-authored-by: Cadyn Bombaci <cadynspacetechguy@gmail.com>
 2024-05-15 13:42:13 +02: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
SplinterGP bfda1018c1 fixes runtime(hopefully) on slime on using oculusosone 2020-06-27 12:29:33 -03:00
Repede 253ecded95 Fixes phorochemistry messages to use to_chat 2020-03-29 21:31:31 -04:00
Repede c5db404f04 Fixes the basic collars to work on teshari using the poncho abuse system, totally ready to break them fluff collars. 2020-02-28 22:48:07 -05:00
izac112 8dfe99ce43 Rad-X Overdose is now 45 so you cant just fill yourself with infinite ammounts and it now metabs because they are not nanites that avoids your bodies bodily functions until they detect radiation 2020-02-07 17:53:24 +01:00
Repede d16e730e58 Merge branch 'master' into armalisde 2020-01-18 00:46:32 -05:00
Repede fa4d7fb52f Fixes Love Potion spam 2020-01-18 00:41:27 -05:00
Hawk_v3 f641220882 Compilation fixing, and Phorochem depreciation fix. 
We should now be good to go! Praise Travis!
 2020-01-13 20:07:30 +00:00
Repede 0159234240 Fixes outdoor platings 
Phororeagent fixes
 2019-12-09 12:04:41 -05:00
RadiantFlash7 2348fed664 More fixes. 
Fixes for the map.
Fixes turfs, cameras, access issues, and a few more things.
 2019-12-08 18:32:45 -05:00
RadiantFlash7 3fc8f433bc Play Test fixes 
Fixes every single bug in the playtest so far.
 2019-12-08 11:33:54 -05:00
Hawk_v3 c69af2759f UI fixes 
All compiles now
 2019-04-14 19:56:11 +01: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
Hawk_v3 4e66b1f7c7 Initial merge fixes 
Clean Compile, 0E, 0W
 2018-10-03 20:08:55 +01:00
Hawk_v3 1d116b2266 Compile fix 2018-06-22 20:23:05 +01:00
Hawk_v3 6b1055adc8 Commenting out Phoronics until new map. 
Removing design boards from R&D
 2018-06-22 20:16:21 +01:00
RadiantFlash7 9d46e68742 blueshield, more clothes/vests, more weapons, phorochem fixes, 
Map additions, Phorochem interface fix, some phoreagents fixed, Added
gauss weaponry and blueshield x01, added blueshield role with
uniform/closet.
 2018-06-11 21:27:11 -04:00
Repede 9da57c3865 fixed compile error 2018-04-17 12:34:48 -04:00
Repede 7f299ea8a0 Fixing travis warning stuff! 2018-03-30 14:20:15 -04:00
RadiantFlash7 22d13f10c2 All my changes so far. 
note to self: Engineering, Perma, civil jobs, and electricity+piping
 2018-02-02 04:57:01 -05:00