70b88ad181
hardwood material port
2021-10-28 10:21:38 +01:00
9d9cb027de
Fix merge
2021-10-27 20:35:14 -04:00
0cea9c35a6
Remove suicide act
2021-10-27 20:35:12 -04:00
a4cdc80f8c
Stellar delight map files
...
Files for the stellar delight to work probably
there are also some edits to tether and other misc files for the purpose of making things work with multiple maps
CREMATORIUM NO GET TAG
2021-10-27 19:52:39 -04:00
3b5fb11bd1
Merge pull request #11663 from KillianKirilenko/kk-arfg
...
[WIP] Atmospheric Retention Fields
2021-10-27 14:38:56 -04:00
ffabce25b5
Merge pull request #11708 from Hatterhat/drill-buffs
...
wacky haphazardly barely thought through standing drill buffs
2021-10-27 12:10:19 -04:00
72a0e86484
Merge pull request #11705 from GhostActual/brainfood
...
Brainfood
2021-10-27 12:05:14 -04:00
18fa28a431
Merge pull request #11698 from GhostActual/toolz
...
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
16a182a3a7
Merge pull request #11679 from Heroman3003/candle-box
...
Restricts candle boxes to only hold candles
2021-10-27 11:41:22 -04:00
0b870a991c
Merge pull request #11678 from Heroman3003/un-recycling
...
Stops literally everything in the world from being recyclable
2021-10-27 11:40:53 -04:00
7dc1c290c0
Merge pull request #11670 from VOREStation/upstream-merge-8329
...
[MIRROR] Unequipping mask slot won't disable internals when wearing airtight hats
2021-10-27 11:37:40 -04:00
fc81357f48
Merge pull request #11666 from Verkister/patch-92
...
Disables container quick-empty when in a belly
2021-10-27 11:36:04 -04:00
5d3de0b351
Merge pull request #11653 from VOREStation/upstream-merge-8313
...
[MIRROR] Fixes displaced steel displaced
2021-10-27 11:28:03 -04:00
f7a4a00d85
gorf
2021-10-26 01:00:36 -05:00
cc609bdde4
Merge pull request #11589 from VOREStation/upstream-merge-8293
...
[MIRROR] Adds multitools to roboticist/engi toolbelts
2021-10-24 20:04:46 -04:00
fd2032bec7
Adds in flashlights from #11488
2021-10-23 00:10:33 -04:00
e61bfc7dfb
Size increase
...
Adds alpha blocks to artificially increase size
2021-10-22 23:29:52 -04:00
0c404f2553
Small Addition
2021-10-22 23:29:50 -04:00
cb05597d08
Secondary Commit
2021-10-22 23:29:49 -04:00
5631e420df
Base Commit
2021-10-22 23:29:48 -04:00
3ebc4c1803
Base Commit
2021-10-22 23:21:29 -04:00
ea4d9d16f7
Merge branch 'master' into upstream-merge-8281
2021-10-22 14:41:28 -04:00
68978a2838
Fix merge more
2021-10-22 14:39:51 -04:00
6a46891e93
Merge pull request #11544 from VOREStation/upstream-merge-8230
...
[MIRROR] Separates Swimsuit and Athletic Lockers, Adds Wetsuits
2021-10-22 14:23:22 -04:00
1831b69dac
Merge pull request #11543 from VOREStation/upstream-merge-8246
...
[MIRROR] Random Spawner Stuff
2021-10-22 14:23:16 -04:00
6465859813
Fix merge
2021-10-22 14:08:51 -04:00
adaa9ea478
Merge pull request #11533 from VOREStation/upstream-merge-8236
...
[MIRROR] Allows wiping food off cutlery
2021-10-22 13:52:23 -04:00
60e1abe927
Misc additions I made while sleep deprived ( #11535 )
...
* Base Commit
* Small Fix
* Small Fix
* Small Fix
2021-10-22 13:49:13 -04:00
3e2a12b433
Restricts candle boxes to only hold candles
2021-10-14 15:52:40 +10:00
5fcf774e0b
Stops literally everything in the world from being recyclable
2021-10-14 15:39:31 +10:00
f4a050e9fa
Merge pull request #8329 from Atermonera/smoking_in_space
...
Unequipping mask slot won't disable internals when wearing airtight hats
2021-10-10 05:36:30 -04:00
ad0102f30e
Disables container quick-empty when in a belly
...
The proc is coded to dump the contents exclusively on the turf, so a prey hitting that button on a storage item inside a gut would just tp it all onto the ground outside.
2021-10-10 00:29:49 +03:00
ac303a467d
research & construction
2021-10-09 04:47:41 +01:00
3a1583802f
Merge pull request #8313 from Verkister/patch-78
...
Fixes displaced steel displaced
2021-10-04 00:15:37 -04:00
8a1c6d1e85
my god jc, belts!
2021-09-27 20:09:59 +01:00
65629a26e1
Merge pull request #11591 from VOREStation/upstream-merge-8292
...
[MIRROR] Fixes stray bugs
2021-09-27 14:45:22 -04:00
0085a5bd10
Adds more clothing from Polaris and various sources ( #11546 )
...
* Base Commit
* Secondary Commit
* Small Addition
* Small Fix
* Yet another Commit
* small fix
* Small Fix
* Small Addition
* More Commit
* I don't know how to stop
* ushanka
* Small Fix
* *aaaaaaa*
* another add-on
* Small Fix
* Revert "Small Fix"
This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.
* Conflict Fixes
* Revert "Conflict Fixes"
This reverts commit 1af644bdca
2021-09-27 14:31:10 -04:00
1233dd7966
Merge remote-tracking branch 'upstream/master' into kk-knockknock
2021-09-26 15:58:59 +01:00
993dea7d8d
Merge pull request #11566 from Verkister/patch-82
...
Adds randpixel to vore eggs.
2021-09-23 23:47:55 -04:00
2255a2b23c
Merge pull request #11562 from PastelPrinceDan/belts
...
Medical and utility belts of holding
2021-09-23 23:47:32 -04:00
ffd496214a
Merge pull request #11557 from VOREStation/upstream-merge-8252
...
[MIRROR] Expands the material values of certain items.
2021-09-23 23:44:10 -04:00
accc99d7fe
Merge pull request #11554 from VOREStation/upstream-merge-8267
...
[MIRROR] Removes an empty file. No clue what's the deal with this.
2021-09-23 23:39:22 -04:00
2b71ae6b90
Merge pull request #11530 from VOREStation/upstream-merge-8255
...
[MIRROR] Reduces the volume of grabbing jumpsuits.
2021-09-23 23:23:23 -04:00
086f935e85
Merge pull request #11526 from Very-Soft/spawner
...
Update mob spawners/spawns
2021-09-23 23:21:25 -04:00
51ebc41ee1
Merge pull request #11524 from GhostActual/boxed
...
Boxing Day
2021-09-23 23:20:55 -04:00
9703b1d444
sounds & safety
...
- adds a click cooldown so you can't spam tons of noise
- doesn't flick the deny animation unless the door is closed and powered
- alt-clicking on an unpowered door knocks rather than buzzing
- adds a knocking sound for wood (from freesound)
2021-09-17 23:40:58 +01:00
97b5cb426b
KNOCK KNOCK. WHO'S THERE?
...
ME! *KRAAAAK!*
2021-09-14 07:01:24 +01:00
67efbfb247
Fixes stray bugs
2021-09-12 20:17:24 -04:00
0386f03c57
Merge pull request #8293 from Schnayy/toolbelt-change
...
Adds multitools to roboticist/engi toolbelts
2021-09-12 20:16:05 -04:00
7de1448c69
Misc runtime fixes
2021-09-09 20:07:50 -04:00
Killian