Commit Graph

35934 Commits

Author SHA1 Message Date
Schnayy
98d0b5a2bc Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 23:52:12 -05:00
Novacat
2914cbf2ce Merge pull request #6497 from VOREStation/upstream-merge-6648
[MIRROR] Fix Water Resistance.
2020-01-23 17:40:31 -05:00
Novacat
37f2862660 Update species.dm 2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14 Fix Water Resistance. 2020-01-23 17:13:51 -05:00
Heroman
824637d6a4 _vr 2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff Removes prommies weakness to water entirely 2020-01-24 08:11:02 +10:00
Heroman
2ca6c5870a Earlyports fix for water killing everything 2020-01-24 07:59:24 +10:00
Novacat
3d0b07a154 Merge pull request #6485 from VOREStation/upstream-merge-6630
[MIRROR] IP reputation checking
2020-01-21 19:13:19 -05:00
Novacat
2b8ad79db8 Merge pull request #6486 from VOREStation/upstream-merge-6638
[MIRROR] Drops the time between events possible duration.
2020-01-21 18:59:23 -05:00
Novacat
b0b60d051e Update client procs.dm 2020-01-21 18:56:54 -05:00
Atermonera
908489b1bd Merge pull request #6640 from TheFurryFeline/patch-5
Aaaa, typo fixy
2020-01-21 18:14:22 -05:00
Atermonera
c0e64d5126 Merge pull request #6638 from Mechoid/BumpGameMasterTime
Drops the time between events possible duration.
2020-01-21 18:12:47 -05:00
Atermonera
44d334a37c IP reputation checking 2020-01-21 18:11:29 -05:00
Novacat
9e0e860f4e Merge pull request #6454 from VOREStation/discoban
Ban/unban, note/unnote, kick to webhook
2020-01-21 01:46:53 -05:00
Novacat
0679ed4042 Merge pull request #6481 from VOREStation/upstream-merge-6632
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38 Update microwave.dm 2020-01-21 01:36:15 -05:00
Novacat
1688d86772 Merge pull request #6478 from VOREStation/upstream-merge-6621
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632 2020-01-21 01:28:43 -05:00
Novacat
5cac43ef0e Merge pull request #6480 from VOREStation/upstream-merge-6628
[MIRROR] Adds a mega cooking recipe
2020-01-21 01:26:48 -05:00
Novacat
1ee5865327 Merge pull request #6477 from Rykka-Stormheart/shep-dev-earlyport-mech-fixes
Earlyport mech fixes, fix Polecat armor issues
2020-01-21 01:25:44 -05:00
Unknown
f163a60eed Updoot 2020-01-21 01:24:28 -05:00
Novacat
7b815bd594 Update radio.dm 2020-01-21 01:23:57 -05:00
Novacat
d7e919c66f Merge pull request #6482 from VOREStation/upstream-merge-6636
[MIRROR] Fix various syntactic problems
2020-01-21 01:23:04 -05:00
Novacat
1b12757e28 Update scrubber.dm 2020-01-21 01:17:21 -05:00
Novacat
bd06a75f81 Update cargo_train.dm 2020-01-21 01:16:43 -05:00
Novacat
d9ada5bc0e Update scrubber.dm 2020-01-21 01:16:11 -05:00
Novacat
18963d3714 Update Sleeper.dm 2020-01-21 01:15:30 -05:00
Novacat
c72899c7e6 Update microwave.dm 2020-01-21 01:13:37 -05:00
Novacat
59ef7b48cf Update retail_scanner.dm 2020-01-21 01:12:12 -05:00
Novacat
213545ed98 Update cash_register.dm 2020-01-21 01:11:42 -05:00
Novacat
c14f3340ff Update light.dm 2020-01-21 01:11:19 -05:00
Novacat
110d37a4e5 Update misc_special.dm 2020-01-21 01:11:02 -05:00
Novacat
aeee2fd56d Update admin_secrets.dm 2020-01-21 01:10:34 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
f7da338790 Move Microwave recipes to their own subtype of the recipe datum. 2020-01-21 00:35:38 -05:00
Atermonera
d10a72a77f Adds a mega cooking recipe 2020-01-20 23:15:01 -05:00
Atermonera
5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 22:51:52 -05:00
Atermonera
9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Rykka
0b6ace1a3b Smol grammar fix 2020-01-20 18:24:56 -07:00
Rykka
d0f391c650 Earlyport mech fixes, Fix Polecat armor issues 2020-01-20 18:22:05 -07:00
Heroman
27127a11e0 Fixes bots being able to do vore 2020-01-20 11:08:04 +10:00
TheFurryFeline
5b179a8035 Sec Cart Key Fixy
Title. Fixes a downstream issue. This fixes  https://github.com/Yawn-Wider/YWPolarisVore/issues/465

Changelog Notes:

- Fixes broken key usage that, once taken out of the Security Cart, you can't put it back inside the vehicle.
2020-01-19 13:05:44 -05:00
TheFurryFeline
1f99be6906 Light Frame Infinite Steel Fixy (#6633)
* Light Frame Infinite Steel Fixy

Title.

Changelog Notes: 

- Fixes light frames returning 5 steel per deconstruction when 2 steel is used to create the frame.

* Changelog
2020-01-19 00:51:24 -05:00
Shadow-Quill
4bd6a61c94 Alert Revert (#6631) 2020-01-17 03:50:13 -05:00
Aronai Sieyes
2b4064e5cf IP reputation check toggle verb 2020-01-16 10:11:44 -05:00
Novacat
76ff478822 Merge pull request #6467 from VOREStation/upstream-merge-6624
[MIRROR] Changeling Item Name/Desc Fixy
2020-01-16 08:59:33 -05:00
TheFurryFeline
dc0c513086 Changeling Item Name/Desc Fixy (#6624)
* Changeling Name/Desc Fixy

Minor var fixes for the changeling combat boots variation. Apparently name and desc were flipped around, resulting in abnormal name output when removed from a dead Beta Replicant.

* Changelog
2020-01-16 02:56:14 -05:00
Verkister
fa0a6d88a8 Fixes loadout index runtime spam (#6626)
sanity checks saving the day once more.
2020-01-16 02:56:04 -05:00
Novacat
f99069e9ca Merge pull request #6465 from VOREStation/upstream-merge-6620
[MIRROR] Pauses event processing while doing event actions
2020-01-15 23:52:48 -05:00
Atermonera
4fb26a6429 Merge pull request #6620 from Heroman3003/eventpause
Pauses event processing while doing event actions
2020-01-15 23:43:46 -05:00