6e171d3182
Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396
...
[MIRROR] [MIRROR] Matter Matters
2021-03-16 22:22:28 -07:00
a762c07a8a
Update material_recipes.dm
2021-03-10 22:17:41 -07:00
604b71d59b
Merge pull request #1539 from CHOMPStationBot/upstream-merge-9620
...
[MIRROR] [MIRROR] Industrial Expansion
2021-03-10 01:05:16 -05:00
b85e9fc4d9
[MIRROR] Industrial Expansion
2021-03-09 21:53:03 +00:00
9270659dbb
[MIRROR] Matter Matters
2021-03-09 20:42:39 +00:00
598a7814e8
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 20:17:06 +00:00
8be1af3b62
Merge pull request #9849 from Heroman3003/striptease-yeah-baby
...
Makes dance poles (de)constructible
2021-03-04 18:57:20 +00:00
5b4dc36b49
Merge pull request #9816 from VOREStation/upstream-merge-7929
...
[MIRROR] Snow no longer goes clang and shovels are more efficient
2021-02-28 23:29:07 +00:00
ad57e1ad13
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
5211edc9c0
Merge pull request #9573 from VOREStation/upstream-merge-7786
...
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
a1864adb4e
Changing mat name to carpet
...
Red used to be carpet, carpet rework changed it.
IF anyone is willing to code search any non carpet carpets, be my guest and fix this mess, for now, this is a hotfix
2021-01-09 00:46:38 +01:00
d14ab6d796
Fixing Red comfy Chairs. Closes #1014
...
Carpet restructure broke red comfy chairs, why was it this way in the first place, i dunno, lets rework it
2021-01-09 00:36:31 +01:00
7e16cd134a
Merge pull request #9527 from VOREStation/upstream-merge-7780
...
[MIRROR] Adds a Whip.
2020-12-28 17:12:39 +00:00
cd1ad32cb2
Merge pull request #9422 from VOREStation/upstream-merge-7762
...
[MIRROR] Plainleather & Tobacco
2020-12-08 03:38:26 +00:00
5d1977b324
Merge pull request #817 from CHOMPStationBot/upstream-merge-9287
...
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
2020-11-08 23:41:34 -07:00
1cb9bbbf45
Update materials.dm
2020-11-08 17:14:47 -07:00
018d176c51
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 17:04:32 +00:00
54755b9e2b
Port Feeder from Old Chomp
...
FEEEEEEED.
2020-11-04 01:31:11 -07:00
1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
e8f7b01ea4
Merge branch 'master' into kk-adminships
2020-09-27 17:02:08 -04:00
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
95ff8c2080
Tweaks to pickup/equip sounds.
2020-09-20 06:57:07 -04:00
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
eb8ecaddb2
hull/glass replacement, further polish, other misc tweaks
...
also adds plastitanium hull components for later use
2020-09-08 06:34:44 +01:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
d8dcc61ea5
Makes unbreakable walls unacidable ( #7532 )
2020-08-22 04:11:17 -04:00
496322f4f1
Reagent Hoses
2020-08-20 21:24:06 -04:00
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
Razgriz