cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,425 Commits 5 Branches 0 Tags
b456b5287b3bdd2da43b51a226c1031c69efe957
Commit Graph

53 Commits

Author SHA1 Message Date
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
b6d583cbab Merge pull request #9895 from Novacat/nova-basicfixes 
Fixes Industrial Expansion
 2021-03-10 19:27:55 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Cerebulon
4768d6b15a Eris Research/Machine Sprite Port 2020-05-22 20:36:34 -04:00
Atermonera
9c32a0e2b3 Updates machines to use default_apply_parts() 2020-05-07 00:40:34 -04:00
Aronai Sieyes
be6f4e0da0 Add inducer designs, make protolathe take titanium 2020-04-23 15:57:33 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Neerti
f15c5bf29b Merge pull request #6095 from Heroman3003/unduping-synths 
Fixes synthesisers inserting more materials than they had
 2019-04-17 02:36:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Anewbe
729ce71aa0 Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format 2018-08-02 21:45:15 -05:00
Mechoid
2145b0371c Allows circuit printers, protolathes, mech fabricators, and prosthetic fabricators to store and use plastic and osmium sheets. No blueprints currently use either, however. 2018-01-08 21:25:52 -08:00
Mechoid
b43201aa79 Fixes the circuit printer and protolathe's material cost check as well. Updates this local to match Master. 2017-10-16 13:12:08 -07:00
Leshana
860a994818 Finally fixes the autolathe/protolate lid animations. 
* Protolate lid no longer bounces back and forth througout the whole build cycle.
* Autolathe lid no longer closes, snaps open, and then -nothing- until item spawns.
* Instead, the lid closes, stays closed while the item builds, then opens again.
 2017-02-24 21:30:57 -05:00
Atermonera
0fa8a280cf Sheet loaders can feed protolathes and circuit imprinters 2016-12-21 16:47:26 -08:00
SinTwo
045c393683 Revert "Revert "Frame Cleanup"" 
This reverts commit 82722ba42f.
 2016-08-13 19:55:57 -04:00
Yoshax
82722ba42f Revert "Frame Cleanup" 2016-08-06 00:27:03 +01:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517) 
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
 2016-05-03 22:18:12 +01:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius
671b3b2d96 Removes copypaste 2016-01-18 16:04:01 +03:00
Kelenius
ee531578d7 Fixes #94 
Protolathe and CI will now correctly eject materials.
 2016-01-18 15:06:33 +03:00
HarpyEagle
38775120d7 Updates mechfab 
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
 2015-10-08 16:03:32 -04:00
mwerezak
83df0fa8f8 Makes powercells produced by the protolathe start uncharged. 2015-10-08 15:10:51 -04:00
Kelenius
7562f6f01a Updates mechfab interface 
Fixes all bugs I found.
 2015-08-10 17:46:03 +03:00
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
 2015-05-20 11:50:28 +03:00
Kelenius
35a6ba6b87 Axes prototyping. o7 2015-05-19 21:12:17 +03:00
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
Neerti
326fde4c5f Adds the research module, condensed into one commit so far. 2015-04-04 20:17:59 -04:00
Kelenius
db30c15e4c Updates to science 
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
 2015-04-04 13:38:03 +03:00
Kelenius
b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science 
Also adds RPED and makes biogenerator and borg charger constructible .
 2015-02-08 15:39:11 +03:00
Zuhayr
d278e496ee Fixes #6645 2014-10-11 06:58:44 +10:30
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
mwerezak
83d54af746 Adjusts power usage for R&D equipment 2014-07-27 03:36:28 -04:00
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Segrain
6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00
aranclanos@hotmail.com
75b8a38977 Runtime fix for inputing the number of sheets that you want to add into a protolathe, when the sheet doesn't exist. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5486 316c924e-a436-60f5-8080-3fe189b3f50e
 2013-01-07 12:06:31 +00:00
aranclanos@hotmail.com
0258d5be22 -Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel) 
-Reduced the chunks of code about minerals in door_assembly.dm

Preeeetty much this commit is just to update all the files to the new path of the minerals. From here, if I can, I'll start changing one by one to remove the huge chunks of code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5087 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-11-16 15:00:09 +00:00
elly1989@rocketmail.com
4073ac9b00 Replaced all 'file.extension' references with 'relativepath/file.extension' using a script by thvortex of ss13-daedalus. 
All credits to the author for this handy little script.
I Committed the modified python script to tool directory. Although it needs to be in the root folder of your repo to work.

To notice the improved compile times, in dreammaker go to Build > Preferences > and untick "automatically set file_dir for subfolders"

If this commit inteferes with any large projects just revert it, do your thing, then rerun the script. Easy-peasy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4488 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-08-18 16:33:40 +00:00
baloh.matevz
e6f7615342 - Standardized the code in code/modules/research 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4243 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-07-31 06:01:55 +00:00
sieve32@gmail.com
e8851bddf9 More bugfixes! 
-Fixes an issue with protolathes being able to be loaded forever
-Adds 3 pairs of Mesons to the EngiVend to compensate for all the missing engineering lockers
-Changed the spawn order for lasertag closets (So you can actually click the different items)
-Makes lasertag turrets and ED-209's much more efficient, prevents them from shooting at downed people, they don't target 'criminals', they cannot be used by the opposing team, most options are auto-magically set on creation and the buttons to change them are disabled (Everything but the on/off and the patrol for ED's, for now), and when emagged, they fire 'omnitag' bolts (Stuns everyone with a vest)
-Gave blue lasertag bolts their own sprite to match the style of the red tags
-Nerfed the amount of radiation from the radium and uranium reagents

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3866 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-06-19 02:00:02 +00:00