cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 06:26:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
317 Commits
Author SHA1 Message Date
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
mwerezak 56065022a7 Updates fire_act() implementations to work better with lower temperature fires 
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
 2015-06-26 00:40:55 -04:00
mwerezak 9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Zuhayr f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
PsiOmegaDelta c3f0a46c19 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/briefcase.dm
	html/changelogs/.all_changelog.yml
 2015-06-05 10:39:41 +02:00
PsiOmegaDelta 7f9996eece Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-06-05 10:23:23 +02:00
GinjaNinja32 63ea8338fb Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/ZAS/Diagnostic.dm
	code/game/machinery/computer3/laptop.dm
	code/game/machinery/requests_console.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
 2015-06-05 00:49:13 +01:00
PsiOmegaDelta 65fc980b20 Stack splitting and cable merging fixes. 
Split stacks will now keep the same colors.
Can now only join cables of the same color together, unless you are a borg.
 2015-06-04 13:24:12 +02:00
GinjaNinja32 c77605265c code/game/objects, code/game/machinery merge fix 2015-06-02 20:18:45 +01:00
Zuhayr ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
Zuhayr 1a4f3952d1 Cosmetic fixups. 2015-05-31 17:10:49 +09:30
Zuhayr ff5c815d01 Fixes #9487 2015-05-31 01:38:04 +09:30
PsiOmega d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
Zuhayr c5df326533 Fixes #9414 2015-05-30 03:15:19 +09:30
Kelenius 5be2bd6a1b Updates to properly DA materials 2015-05-23 15:21:11 +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
Zuhayr 4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Zuhayr ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr 150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30
Zuhayr a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
Zuhayr 1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
GinjaNinja32 354859b889 Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks 2015-05-15 04:47:18 +01:00
GinjaNinja32 5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
GinjaNinja32 4b87799072 New tables, code section. Changelog entry soon. 2015-05-13 19:08:39 +01:00
Zuhayr 495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr 79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
Zuhayr dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmega 516b60962e Merge remote-tracking branch 'upstream/dev' into CultPorting 2015-04-14 15:54:22 +02:00
Zuhayr 0223223c77 Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff 
Revenge of the Research Module (and other stuff from that PR)
 2015-04-12 13:16:45 +09:30
PsiOmega f3be9b41f0 Ports /vg/'s Nas-Sie remake. 
First phase: Port cultify procs.
 2015-04-11 13:58:08 +02:00
PsiOmega 1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/vending.dm
 2015-04-10 15:25:34 +02:00
Kelenius 20d62c87ff Borg module fixes 
Fixes #8775
Fixes #8797
 2015-04-10 09:50:47 +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
mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/modules/organs/organ_external.dm
 2015-03-31 02:13:22 -04:00
mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
mwerezak 1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
Zuhayr aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr 97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
PsiOmega 2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00