cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 9 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

352 Commits

Author SHA1 Message Date
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets 
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
 2020-05-22 03:55:04 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Mechoid
7066d04df5 Explorer Expansion: New Horizons 2020-05-01 14:20:29 -04:00
Aronai Sieyes
8327864b05 Add cardboard cutouts 2020-04-21 13:40:08 -04:00
Aronai Sieyes
88154f0374 Adds rutile (titanium ore) and other materials 2020-04-20 12:07:45 -04:00
Aronai Sieyes
fecfd86389 Adds fancy tables 2020-04-18 21:45:09 -04:00
Razgriz
34722b1e6a Update material_recipes_ch.dm 2020-04-12 01:48:25 -07:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Atermonera
8d2b41ad2c Big Bastard Incidental Sound Port 2020-03-15 14:39:19 -04:00
Atermonera
e45a95d365 Robotics Expansion: RIG-ged and Ready 2020-03-11 15:56:18 -04:00
Shadowfire
f6daac300f fixy fix 
Okay, fixed a lot of issues and reacted to the comments to parts of commit, hopefully we will get a nice pretty travis report this time
 2020-03-09 15:31:04 +01:00
Shadowfire
3c3817ecd3 Bug fixing, improvements to furniture, jukebox change 
Made casino jukebox music finally only appear on its proper jukebox
made tiles have material variable, allowing recovery of carpets from padding
made carpets give padding different colors
made stools also benefit from colored padding
Made modular sofas able to be made from plasteel and plastic
 2020-03-07 09:49:36 +01:00
Shadowfire117
010f01bf30 Sofa additions 
wooden sofas now have correct color
made addition so the modular sofas also change sprites/color with materials
 2020-03-04 11:37:51 +01:00
Shadowfire
5b0bfcde7a wip casino1 
Made confetti sprite and system
Made a confetti grenade
Made special casino card deck and sprites that doesnt contain joker
made sofa constructible from wood, still needs more work
added new casino card decks to casino map
 2020-03-02 22:30:33 +01:00
Aronai Sieyes
c03532be58 Fixes missed commenting out of line 2020-03-01 19:21:44 -05:00
Aronai Sieyes
545a6cc447 Fix building med stands 2020-03-01 19:13:40 -05:00
Novacat
82fb69489a Merge pull request #6647 from VOREStation/aro-table 
Additional table type
 2020-03-01 10:54:31 -05:00
Aronai Sieyes
db04d43f2c Made the new chairs steelsheet constructable 2020-02-29 13:02:43 -05:00
Heroman
2af35479b2 Fixes orange sofa recipe name 2020-02-27 15:33:43 +10:00
Heroman
8bba3cdd06 Adds orange sofa recipe 2020-02-27 14:28:57 +10:00
Atermonera
695ea645fe Merge pull request #6740 from Heroman3003/orangeyellow 
Adds orange and yellow cloth materials
 2020-02-26 20:26:40 -05:00
Heroman
726664f6f0 Makes all sofa colors/subtypes makeable 2020-02-24 18:19:56 +10:00
Atermonera
11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Aronai Sieyes
454fc60687 Additional table type 
Darkglass!
 2020-02-21 17:33:24 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
lbnesquik
e0fcf47373 Add a craftable, two-handed sledgehammer. 
- Can be made out of plasteel, rods and metal.
- Relatively high damage but less than the fireaxe.
- Special sound.
 2020-01-21 13:48:28 +01:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491) 
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
 2019-11-04 21:38:02 -05:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Atermonera
89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Atermonera
7b126e37b7 Merge pull request #6404 from Heroman3003/flappening 
Makes airtight plastic flaps unmakeable
 2019-09-22 19:53:30 -04:00
Heroman
f315f07205 Earlyports fixes to sandstone and adminwall 2019-09-20 13:27:58 +10:00
Mewchild
7462847479 Ports Sofas from CitRP 2019-09-10 00:15:07 -05:00
Unknown
0d73c8ad76 Early Polaris Ports 
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
 2019-08-30 23:55:58 -04:00
Atermonera
2c8197bd9a Merge pull request #6415 from Heroman3003/bellfixes 
Adjusts some desk bell mechanics
 2019-08-23 21:43:38 -04:00
Novacat
31924e23de Update materials.dm 2019-08-08 16:09:13 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Atermonera
8952374cce Merge pull request #6264 from Heroman3003/awood 
Fixes alien wood issues
 2019-07-03 23:09:42 -04:00
Atermonera
9d207a28fd Merge pull request #6249 from Heroman3003/lead-stack 
Makes lead icon display stack
 2019-07-01 20:48:45 -04:00
Ketrai
cea411049a Adds a durasteel fishing rod. 2019-06-07 16:48:35 +02:00
Neerti
5a3040a08d Merge pull request #6183 from Mechoid/FixPrecursotechOversights 
Fixes some Precursotech oversights.
 2019-05-31 22:18:00 -04:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1 
Ports Radial Menus
 2019-05-28 14:25:49 -04:00
Atermonera
90ee680dd5 Fishing! 2019-05-06 14:16:27 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
6d123c8d73 Update materials.dm 2019-04-13 22:55:08 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Anewbe
2572f3a145 Merge pull request #5747 from Neerti/fulltile_window_improvements 
Makes fulltile windows seperate from dir
 2018-12-04 14:37:19 -05: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
Mechoid
69ad0ce12b Cult Girders are back to being proper. 2018-08-30 22:21:21 -07:00