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
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
735230d642
TGUI Metal Menu (Travis stop it)
2020-09-11 21:21:50 -07:00
dd4f9c9967
TGUI NTOS - Total Conversion
2020-09-05 17:02:58 -07:00
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
6bb324fd55
fix comment compile error
2020-07-13 03:08:46 -07:00
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
cf891ce999
Update code/game/objects/items/stacks/tiles/tile_types.dm
2020-07-04 08:26:15 +02:00
8221cbc4ad
Adds in the files because I'm a dummy
2020-07-04 01:25:23 -05:00
2098a55ae7
Adds in the other carpet types as a buyable crate.
2020-07-04 01:18:26 -05: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
6809133d75
Port Eris' extensive floor blending system
2020-05-29 14:00:43 -04:00
ea8c29acc8
VS: Dogborg clotter
2020-05-27 16:44:37 -04:00
d58087c18c
Fix medical stack exploit
2020-05-27 16:44:19 -04:00
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
fc849d9e36
Merge pull request #7962 from VOREStation/Arokha/playsound
...
Alter playsound paradigm
2020-05-19 11:20:52 -04:00
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
a03a3c0960
Change stack autocombine
...
Only happens when dropped or pulled by a mob, to avoid problems with stack-using machines and conveyors in mining
2020-05-18 22:35:13 -04:00
0b858a36c8
These can't be material stacks if they don't have a material
2020-05-18 10:28:18 -04:00
3911e14936
tg(?) style stack autocombining
2020-05-17 00:47:42 -04:00
d47291ca69
New stack icons for stack items
2020-05-13 17:43:57 -04:00
0b19c528da
Allows do_mob and do_after to be exclusive, to prevent stacking
2020-05-05 19:10:55 -04:00
498b942a29
Fiftyspawners try to place themselves in crates if possible
...
Fixes https://github.com/VOREStation/VOREStation/issues/7163
2020-05-04 21:21:48 -04:00
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04: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
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
06b7651799
Update nanopaste.dm
2020-02-10 18:59:12 -05:00
6374108fa2
Applies same restrictions as first aid to external synth repair
2020-02-10 18:53:31 -05:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
ac3f9ea671
Makes threshold be based on specific organ rather than straight 10
2019-09-20 12:42:38 +10:00
c3ad552d64
Implements an icon for Advanced Nanopaste (by Chaoko99)
2019-09-19 03:55:50 +10:00
444c06b8d1
Adds edit, variables
2019-09-18 17:24:23 +10:00
0fb140d01c
Nerfs regular nanopaste, adds advanced one
2019-09-18 16:35:42 +10:00
f15c7cd16e
Merge pull request #5514 from CameronWoof/medical-sprites
...
Resprites Advanced Burn and Trauma Kits
2019-08-03 07:51:27 -04:00
e6f54d671a
Cyborgs Can See and Repair Holes in Ceiling ( #6347 )
...
* Cyborgs Can See and Repair Holes in Ceiling
* Adds changelog because I keep forgetting
2019-07-27 13:06:52 -04:00
172314f04c
more compliance
2019-07-26 23:43:11 -07:00
2cd2b7a981
code compliance
2019-07-26 23:10:41 -07:00
1aca0bff38
Resprites Advanced Burn and Trauma Kits
2019-07-26 20:13:09 -07:00
1adc4790be
Merge pull request #6221 from mistyLuminescence/bettersplinting
...
Head/chest/groin splints
2019-06-21 17:06:38 -04:00
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
2572f3a145
Merge pull request #5747 from Neerti/fulltile_window_improvements
...
Makes fulltile windows seperate from dir
2018-12-04 14:37:19 -05:00
Cadyn