Commit Graph

9283 Commits

Author SHA1 Message Date
MistakeNot4892
e379fcf7e4 Merge pull request #8216 from Cerebulon/randomvend
Randomized Vendor Spawners for Mapping
2021-08-19 00:58:09 -04:00
Novacat
181a26b039 Merge pull request #11434 from MisterGrimm/XenomorphOverhaul
Fixes minor corrosive acid bug
2021-08-16 23:19:37 -04:00
Sym
28242a62f7 Fixes minor corrosive acid bug
Corrosive acid no longer melts both walls and floors at the same time. Whoops.
2021-08-16 21:10:35 -04:00
VerySoft
e1ec5445e9 Stone bone axe fixxy
It uses the wrong sprite!
2021-08-16 18:04:48 -04:00
Aronai Sieyes
a8bf24b119 Merge pull request #11103 from Very-Soft/rocks
Survival crafting stuff
2021-08-16 12:00:42 -04:00
Aronai Sieyes
cbc246afb9 Merge pull request #11412 from VOREStation/upstream-merge-8198
[MIRROR] Ports a ton of decorative mapping objects
2021-08-15 01:06:38 -04:00
Aronai Sieyes
2baf13f632 Merge pull request #11421 from MisterGrimm/XenomorphOverhaul
Fixes ancient corrosive acid problems for player xenomorphs, makes up to eight years worth of content unacidable
2021-08-15 01:02:41 -04:00
Aronai Sieyes
fd8da95ec7 Merge pull request #11408 from VOREStation/upstream-merge-8178
[MIRROR] Stun Revolver Update
2021-08-15 01:00:11 -04:00
Aronai Sieyes
098357d11f Fix icon paths 2021-08-15 00:57:00 -04:00
Aronai Sieyes
98163fd3fa Fix merge conflicts 2021-08-15 00:50:25 -04:00
Sym
ed7f4b9e75 Fixes corrosive acid, makes most important things unacidable
Makes pretty much anything important to the crew unacidable, fixes how acid interacts with floors.
2021-08-14 10:49:44 -04:00
Aronai Sieyes
d6fd7c37a9 Ports a ton of decorative mapping objects 2021-08-13 23:30:16 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
Schnayy
ceb4488540 Stun Revolver Update 2021-08-13 18:17:21 -04:00
Aronai Sieyes
cccab8a39b Redo how animation metadata is stored
Better fix than just copying Skyrat further
2021-08-13 16:23:06 -04:00
Aronai Sieyes
d14cd7fd46 Merge pull request #11396 from KillianKirilenko/kk-adminships
Fix Salamanders and Wall-lockers
2021-08-13 11:40:15 -04:00
Ghost Actual
257f18b7ed Virology Revamp (#11384)
* Base Commit

* The Manual

* Small Fix

Overlay issue discovered while testing

* Small Fix

* Small Fix

Forgot the Virgo effects in the book
2021-08-13 11:37:41 -04:00
Killian
4b32da920f fix salamanders and wall-lockers 2021-08-12 20:29:34 +01:00
Novacat
486a4f33b8 Merge pull request #11387 from Heroman3003/dupefix
Fixes infinite material duplication in R&D
2021-08-10 22:50:59 -04:00
Heroman
9a690a41df Fixes in split instead of input 2021-08-11 07:17:21 +10:00
Heroman
face394b62 Fixes infinite material duplication in R&D 2021-08-11 06:57:48 +10:00
VerySoft
895a0574d5 Adds extra text to maint pred and morph spawns
What's there doesn't really give any hints about what's allowed or expected, so, I added some, since there's been some understandable misunderstandings.
2021-08-10 06:38:33 -04:00
VerySoft
bced5fb133 blep 2021-08-09 17:48:10 -04:00
VerySoft
80fac42aa4 make it not random :C 2021-08-09 17:48:10 -04:00
VerySoft
29b29bf8a6 Survival crafting stuff
Stuff! For surviving in the wilderness.
2021-08-09 17:48:10 -04:00
Aronai Sieyes
6677df399d Port of monster860's animated doors to bay closets 2021-08-08 19:41:48 -04:00
Ghost Actual
3018ff04b5 CHOMPStation Casino Port (#11301)
* Create casino.dmi

* Base Commit

* Secondary Commit

* Third Commit

* Final Commit

* Final Final Commit

* Update casino_book.dm

* Update casino_cards.dm

* Update casino_cards.dm

* Update casinocash.dm

* The Claaaaaw

* Power Fix

* fix
2021-08-07 17:32:35 -04:00
Aronai Sieyes
2783edc995 Merge pull request #11336 from VOREStation/Icons/skyratexting
Skyrat extinguisher cabinet sprites
2021-08-06 11:35:41 -04:00
Aronai Sieyes
8b8fd08d0e Skyrat extinguisher cabinet sprites 2021-08-02 13:31:25 -04:00
Aronai Sieyes
22494fd7ea Skyrat benches 2021-08-02 12:10:29 -04:00
Aronai Sieyes
d0fcb1dace Few more outdoors fixes 2021-08-01 12:03:13 -04:00
Aronai Sieyes
e1fc615bca Merge pull request #10773 from VOREStation/upstream-merge-8155
[MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 11:41:25 -04:00
Atermonera
9d84e7881c Fixes Indoor Rain 2021-08-01 11:27:30 -04:00
Neerti
78f31a9b2d Adds optional area-based definition for outdoors-ness 2021-08-01 11:27:28 -04:00
klaasjared
5efd6c0396 Base Commit 2021-07-30 23:01:39 -04:00
Aronai Sieyes
78723da872 Merge pull request #11298 from VOREStation/Arokha/arcadecarpets
Add arcadey carpets
2021-07-29 16:09:12 -04:00
Aronai Sieyes
3075ca8b01 Add arcadey carpets 2021-07-29 14:31:40 -04:00
Aronai Sieyes
67a81f9aa2 Two random map fixes 2021-07-29 00:45:16 -04:00
Atermonera
65c900f5a8 Custom poster fix (#8174)
* Replaces DEFAULT_WALL_MATERIAL with MAT_STEEL, where applicable

* floorbot compiles

* fixes custom posters

* adds lint
2021-07-28 22:25:51 -04:00
Aronai Sieyes
5572e62c25 Remove atom/Uncross override
It's the most overtime proc on the server
2021-07-28 16:01:41 -04:00
Aronai Sieyes
4b4dc1e2e1 Merge pull request #11285 from VOREStation/Arokha/gasmix
Exhale into drop pods
2021-07-28 12:24:37 -04:00
Aronai Sieyes
e1c7c21ea1 Merge pull request #11283 from VOREStation/Arokha/gunprops
Add some ship gun props from TGMC
2021-07-28 12:22:35 -04:00
Aronai Sieyes
0f7e9c4620 Merge pull request #11280 from VOREStation/Arokha/mach
SSmachines optimizations
2021-07-28 12:22:20 -04:00
Aronai Sieyes
baf9acf0e7 Add some more props 2021-07-28 11:53:15 -04:00
Aronai Sieyes
fb1494f68b Exhale into drop pods 2021-07-28 10:38:02 -04:00
Aronai Sieyes
6c797b906d Fix some CanPass stuff 2021-07-27 21:18:41 -04:00
Aronai Sieyes
8e4f05baed Tables behave better for flipping purposes 2021-07-27 19:59:29 -04:00
Aronai Sieyes
1a4946578a Merge pull request #11259 from VOREStation/Arokha/dropfix
AAAAAA
2021-07-26 17:23:32 -04:00
Aronai Sieyes
8d1fa022f8 Remove The Jerky 2021-07-26 17:06:06 -04:00
Ghost Actual
c8be420fbe 7/22/2021 Food Revamp (#11210)
* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Base Commit

* Forgot the New Chips

* Forgot Chicken Fillet

* Conflict Fix

* Oopsie

* Fixes known issues

* Uploads Files for Remote Work

* Small Fix

* Final Commit (hopefully)

* Small Fix
2021-07-26 12:51:00 -04:00