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

164 Commits

Author SHA1 Message Date
CHOMPStation2StaffMirrorBot
54087103bf [MIRROR] fix some bad material handling (#11997) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-11-18 01:18:14 +01:00
CHOMPStation2StaffMirrorBot
4099a9435b [MIRROR] Machine var shim (#11878) 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
 2025-10-27 02:35:27 -04:00
CHOMPStation2StaffMirrorBot
ac77b94d4b [MIRROR] Techweb Fixes (#11299) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-08-05 00:36:43 +02:00
ShadowLarkens
eb3409d304 Techwebs (#11249) 2025-08-01 19:28:40 +02:00
CHOMPStation2StaffMirrorBot
ce2446922e [MIRROR] Initialize fixing (#10335) 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2025-03-08 22:22:04 +01:00
CHOMPStation2StaffMirrorBot
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
CHOMPStation2StaffMirrorBot
e9912dd0ac [MIRROR] Update the autolathe UI, make it less laggy (#9322) 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
 2024-10-26 17:37:53 +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
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
Drathek
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750) 
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-16 10:54:47 +01:00
CHOMPStation2
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
Heroman3003
2281afdf24 More 515 Compatibility 2023-06-05 21:21:35 +00:00
Heroman3003
165d947e91 Fixes autolathe, material and smartfridge issues 2022-12-28 21:48:06 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Razgriz
fe29261085 Undoes YW edits and pulls directly from Virgo 
Lets see how this dicks things up.
 2021-06-12 23:22:07 -07:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
SplinterGP
183a3f5282 comments 2020-09-15 20:43:41 -03:00
SplinterGP
2c62860a8e autolathe recycle materials 2020-09-15 20:23:01 -03:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00
Aronai Sieyes
bcb314813d Merge upstream PR 2020-05-22 20:57:18 -04:00
Cerebulon
4768d6b15a Eris Research/Machine Sprite Port 2020-05-22 20:36:34 -04:00
Aronai Sieyes
074055cd80 Update autolathe.dm 2020-05-07 10:28:41 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
783c951aab Add filter option to autolathe, convert to fakenano 2020-05-05 11:01:03 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Novacat
9b54f851b7 Merge pull request #6819 from VOREStation/upstream-merge-6810 
[MIRROR] QoL: Hacking
 2020-03-11 21:26:36 -04:00
Neerti
22954a5a04 QoL: Hacking (#6810) 
* Makes hacking window consider all hands instead of just the active one.

* Makes bottom indicators in hacking window go bold if they changed since the last refresh.

* Changelog
 2020-03-11 20:36:42 -04:00
Cerebulon
80f7f3afb2 Adds more machine button sounds (#6802) 
* Adds more machine button sounds

* chang
 2020-03-11 20:32:06 -04:00
Atermonera
54966826af Merge pull request #6320 from Nalarac/Autolathe 
Allows Multiple Light Printing in Autolathe
 2019-07-22 00:44:30 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Anewbe
c2794c571d Hopefully fixes some tool-conversion things 2018-08-03 15:13:29 -05:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
killer653
11c195debb Polaris Sync 2017-11-04 13:37:13 -04:00
Neerti
e935df9702 Proto/Autolathe lag fix 
Makes the two machines concatenate a lot less and not make BYOND's super secret string tree cry, hopefully.
 2017-10-27 04:00:44 -04:00
Spades
0540593119 Final additions and fixes 2017-07-04 20:01:38 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
 2017-06-01 17:27:00 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent 
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
 2017-05-26 19:32:23 -04:00
Arokha Sieyes
9ed580c6b1 Eris Machines 
Autolathe, Robotics machines, R&D machines
 2017-04-23 18:30:39 -04:00