f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
50834e4a7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-02 23:52:01 +02:00
78b51c58b4
Fish tank
2020-08-01 23:46:08 -04:00
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
a940d19a13
Update material_recipes.dm
2020-07-24 08:43:34 -04:00
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
6a38c309af
Makes wood logs worth points (lumbering time)
2020-07-02 23:54:09 -04:00
a878782e93
Adds Shipping Value to Plastitanium
...
8/8
2020-06-19 02:38:24 -04:00
9957da080d
Merge pull request #7283 from MistakeNot4892/supmat
...
Generalizes supply points per material sheet to the material datum.
2020-06-16 03:29:13 -04:00
215792e703
Adds Creation of Whetstones from Durasteel & Plastitanium
...
Can currently be done with plasteel and titanium.
2020-06-14 23:13:42 -04:00
75901775a0
Adds marble floor tiles and crafting recipe ( #7264 )
...
* Adds marble floor tiles and crafting recipe
* swaps screwdriver removal for crowbar
* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
2020-06-06 14:36:25 -04:00
fd665ed938
Amend Nomenclature for Clarity & Consistency
...
Opted to leave the trait datum type and name for the sake of reference & mild humour.
2020-05-22 12:12:32 -04:00
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
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
7066d04df5
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
8327864b05
Add cardboard cutouts
2020-04-21 13:40:08 -04:00
88154f0374
Adds rutile (titanium ore) and other materials
2020-04-20 12:07:45 -04:00
fecfd86389
Adds fancy tables
2020-04-18 21:45:09 -04:00
34722b1e6a
Update material_recipes_ch.dm
2020-04-12 01:48:25 -07:00
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
e45a95d365
Robotics Expansion: RIG-ged and Ready
2020-03-11 15:56:18 -04:00
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
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
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
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
c03532be58
Fixes missed commenting out of line
2020-03-01 19:21:44 -05:00
545a6cc447
Fix building med stands
2020-03-01 19:13:40 -05:00
82fb69489a
Merge pull request #6647 from VOREStation/aro-table
...
Additional table type
2020-03-01 10:54:31 -05:00
db04d43f2c
Made the new chairs steelsheet constructable
2020-02-29 13:02:43 -05:00
2af35479b2
Fixes orange sofa recipe name
2020-02-27 15:33:43 +10:00
8bba3cdd06
Adds orange sofa recipe
2020-02-27 14:28:57 +10:00
695ea645fe
Merge pull request #6740 from Heroman3003/orangeyellow
...
Adds orange and yellow cloth materials
2020-02-26 20:26:40 -05:00
726664f6f0
Makes all sofa colors/subtypes makeable
2020-02-24 18:19:56 +10:00
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
454fc60687
Additional table type
...
Darkglass!
2020-02-21 17:33:24 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
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
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
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
7b126e37b7
Merge pull request #6404 from Heroman3003/flappening
...
Makes airtight plastic flaps unmakeable
2019-09-22 19:53:30 -04:00
f315f07205
Earlyports fixes to sandstone and adminwall
2019-09-20 13:27:58 +10:00
7462847479
Ports Sofas from CitRP
2019-09-10 00:15:07 -05:00
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
2c8197bd9a
Merge pull request #6415 from Heroman3003/bellfixes
...
Adjusts some desk bell mechanics
2019-08-23 21:43:38 -04:00
31924e23de
Update materials.dm
2019-08-08 16:09:13 -04:00
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
Razgriz