Commit Graph

9385 Commits

Author SHA1 Message Date
R3dtail
c0895f2d34 requested changes 2021-11-07 17:07:06 -06:00
R3dtail
c97165a3ba Makes fuzzycuffs easier to get out of 2021-11-07 16:53:43 -06:00
Casey
0502970c3f Merge pull request #11752 from Heroman3003/jobstuff2
Renames Engineer, new alt-titles for Stellar Delight
2021-11-06 03:44:47 -04:00
Heroman
1ce9880aeb Fixes infinite glass from low walls 2021-11-05 15:54:53 +10:00
Heroman
a4dc3e0c93 Fixes a broken poster 2021-11-04 12:37:54 +10:00
Heroman
dbe9387f5f Renames Engineer, new alt-titles for Stellar Delight 2021-11-02 19:56:49 +10:00
Heroman
4b38fb9034 Modularizes SD files a bit 2021-10-31 08:42:18 +10:00
Aronai Sieyes
b4ce0442cd Merge pull request #11722 from KillianKirilenko/kk-misc
Hardwood Material Port
2021-10-30 17:25:23 -04:00
Casey
55ee669869 Merge pull request #11710 from Very-Soft/SDremaster
Stellar Delight!
2021-10-30 09:33:21 -04:00
VerySoft
f2164827b4 The final updates
Adds a new random spawner for coins with a fail chance (so the coins aren't always in the same place)

Addsome missing vending machines to the random vending machine spawner 

Adds a sound to starting and stopping in ships (that only plays at most once every 10 seconds.)

And sets it up so that planets and ships can have a sound when visited.

A bunch of little map tweaks to polish things up!
2021-10-29 02:29:42 -04:00
Killian
70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
Aronai Sieyes
9d9cb027de Fix merge 2021-10-27 20:35:14 -04:00
MistakeNot4892
0cea9c35a6 Remove suicide act 2021-10-27 20:35:12 -04:00
VerySoft
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
Aronai Sieyes
3b5fb11bd1 Merge pull request #11663 from KillianKirilenko/kk-arfg
[WIP] Atmospheric Retention Fields
2021-10-27 14:38:56 -04:00
Casey
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
Casey
72a0e86484 Merge pull request #11705 from GhostActual/brainfood
Brainfood
2021-10-27 12:05:14 -04:00
Casey
18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
Casey
16a182a3a7 Merge pull request #11679 from Heroman3003/candle-box
Restricts candle boxes to only hold candles
2021-10-27 11:41:22 -04:00
Casey
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
Casey
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
Casey
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
Casey
5d3de0b351 Merge pull request #11653 from VOREStation/upstream-merge-8313
[MIRROR] Fixes displaced steel displaced
2021-10-27 11:28:03 -04:00
Hatterhat
f7a4a00d85 gorf 2021-10-26 01:00:36 -05:00
Aronai Sieyes
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
klaasjared
fd2032bec7 Adds in flashlights from #11488 2021-10-23 00:10:33 -04:00
klaasjared
e61bfc7dfb Size increase
Adds alpha blocks to artificially increase size
2021-10-22 23:29:52 -04:00
klaasjared
0c404f2553 Small Addition 2021-10-22 23:29:50 -04:00
klaasjared
cb05597d08 Secondary Commit 2021-10-22 23:29:49 -04:00
klaasjared
5631e420df Base Commit 2021-10-22 23:29:48 -04:00
klaasjared
3ebc4c1803 Base Commit 2021-10-22 23:21:29 -04:00
Aronai Sieyes
ea4d9d16f7 Merge branch 'master' into upstream-merge-8281 2021-10-22 14:41:28 -04:00
Aronai Sieyes
68978a2838 Fix merge more 2021-10-22 14:39:51 -04:00
Aronai Sieyes
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
Aronai Sieyes
1831b69dac Merge pull request #11543 from VOREStation/upstream-merge-8246
[MIRROR] Random Spawner Stuff
2021-10-22 14:23:16 -04:00
Aronai Sieyes
6465859813 Fix merge 2021-10-22 14:08:51 -04:00
Aronai Sieyes
adaa9ea478 Merge pull request #11533 from VOREStation/upstream-merge-8236
[MIRROR] Allows wiping food off cutlery
2021-10-22 13:52:23 -04:00
Ghost Actual
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
Heroman
3e2a12b433 Restricts candle boxes to only hold candles 2021-10-14 15:52:40 +10:00
Heroman
5fcf774e0b Stops literally everything in the world from being recyclable 2021-10-14 15:39:31 +10:00
MistakeNot4892
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
Verkister
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
Killian
ac303a467d research & construction 2021-10-09 04:47:41 +01:00
MistakeNot4892
3a1583802f Merge pull request #8313 from Verkister/patch-78
Fixes displaced steel displaced
2021-10-04 00:15:37 -04:00
Killian
8a1c6d1e85 my god jc, belts! 2021-09-27 20:09:59 +01:00
Aronai Sieyes
65629a26e1 Merge pull request #11591 from VOREStation/upstream-merge-8292
[MIRROR] Fixes stray bugs
2021-09-27 14:45:22 -04:00
Ghost Actual
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.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
Killian
1233dd7966 Merge remote-tracking branch 'upstream/master' into kk-knockknock 2021-09-26 15:58:59 +01:00
Casey
993dea7d8d Merge pull request #11566 from Verkister/patch-82
Adds randpixel to vore eggs.
2021-09-23 23:47:55 -04:00
Casey
2255a2b23c Merge pull request #11562 from PastelPrinceDan/belts
Medical and utility belts of holding
2021-09-23 23:47:32 -04:00