Commit Graph

29883 Commits

Author SHA1 Message Date
Schnayy
18199a5dfd Adds book cart to library (#6645) 2020-01-23 20:51:38 -08:00
Schnayy
0b8ca6267d Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. (#6644) 2020-01-23 20:50:53 -08:00
Mechoid
a1f785d282 Update augment.dm 2020-01-23 15:43:25 -08:00
Mechoid
8e0b2f11dc FixWaterA G A I N 2020-01-23 13:39:45 -08:00
Atermonera
af635d0978 Merge pull request #6640 from TheFurryFeline/patch-5
Aaaa, typo fixy
2020-01-21 15:13:49 -08:00
Atermonera
46418f1d36 Merge pull request #6638 from Mechoid/BumpGameMasterTime
Drops the time between events possible duration.
2020-01-21 15:12:16 -08:00
Atermonera
ea8bf0ad0b Merge pull request #6630 from Novacat/nova-alerts
IP reputation checking
2020-01-21 15:10:27 -08:00
Novacat
53202480bb Update client procs.dm 2020-01-21 01:42:26 -05:00
Atermonera
9684db1fe4 Merge pull request #6636 from SpaceManiac/patch/syntax
Fix various syntactic problems
2020-01-20 22:05:25 -08:00
Mechoid
a26cf77c52 Convert The Cake to microwave recipe type. 2020-01-20 21:06:31 -08:00
Mechoid
fff1438a50 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into TheGreatMicrowaveMigration
# Fix Conflicts:
#	code/modules/food/kitchen/microwave.dm
2020-01-20 21:03:57 -08:00
Atermonera
0dbcdf6e55 Merge pull request #6628 from Ketrai/cakebranch
Adds a mega cooking recipe
2020-01-20 20:14:07 -08:00
Atermonera
50d9274819 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 19:51:35 -08:00
Atermonera
5d5e361649 Merge pull request #6621 from Shadow-Quill/Desc-Adds
Moar descriptions for things
2020-01-20 19:48:57 -08:00
TheFurryFeline
b21088bc49 Aaaa, typo fixy
Changelog Notes: 

- Fixes an extra "unleash" in desc.
2020-01-20 13:37:50 -05:00
Mechoid
19c236d93c Drops the time between events possible duration. 2020-01-19 14:50:52 -08:00
Mechoid
6cd803be7e Augments that deploy items can no longer be used when strapped to a bed or other lying-restraint. 2020-01-19 14:24:46 -08:00
Tad Hardesty
f44d31451e Fix remaining diagnostics 2020-01-18 23:01:36 -08:00
Tad Hardesty
d8a64c83dc Use compatible var statements 2020-01-18 23:01:36 -08:00
Tad Hardesty
7bd3208cc6 Fix loop and control flow syntax 2020-01-18 23:01:36 -08:00
Tad Hardesty
6ed5f8de4b Replace () with null where appropriate 2020-01-18 23:01:36 -08:00
Tad Hardesty
644347cfeb Remove stray . and ..() 2020-01-18 23:01:36 -08:00
TheFurryFeline
c3854dc5b4 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-18 21:50:12 -08:00
Ketrai
6db1d29836 Ports deathbell because the recipe requires it. 2020-01-18 12:43:29 +01:00
Shadow-Quill
1f77cba62f Alert Revert (#6631) 2020-01-17 00:48:27 -08:00
Unknown
edb88b7e60 Adds a verb 2020-01-16 15:21:03 -05:00
Heroman3003
74fcb1ed27 Fixes alt-titles with custom outfit not having access (#6627) 2020-01-15 23:56:29 -08:00
Verkister
aee06aec3d Fixes loadout index runtime spam (#6626)
sanity checks saving the day once more.
2020-01-15 23:55:45 -08:00
TheFurryFeline
fb6394b89d 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-15 23:55:23 -08:00
Mechoid
4504d9dfe7 Update human_defense.dm 2020-01-15 23:49:18 -08:00
Mechoid
274b1e06ac Moves microwave recipes to their own subtype of the recipe datum, freeing it from the torment of being used solely for food. 2020-01-15 23:46:05 -08:00
Atermonera
929ba9c96b Merge pull request #6620 from Heroman3003/eventpause
Pauses event processing while doing event actions
2020-01-15 20:43:25 -08:00
Atermonera
6b736d9ec0 Merge pull request #6617 from Shadow-Quill/Paper-Pen-Confirmation
Adds holding pen check + alert
2020-01-15 20:41:51 -08:00
Atermonera
4284dd784c Merge pull request #6619 from Shadow-Quill/Chem-Master-Building
Can now (de)construct chem masters
2020-01-15 20:15:33 -08:00
Atermonera
1bab9d5ddd Merge pull request #6618 from Shadow-Quill/Event-Manager-Time-Fix
Event manager logs now show correct station time
2020-01-15 20:10:03 -08:00
Atermonera
2c8495c056 Merge pull request #6616 from Shadow-Quill/Sign-Lang-Translator-Fix
Sign Language translator now properly works
2020-01-15 20:09:40 -08:00
Atermonera
45e9dae731 Merge pull request #6615 from Shadow-Quill/Ion-Fix
Fixes ion proj not EMPing when hitting walls
2020-01-15 20:09:14 -08:00
Atermonera
69dcbf47dd Merge pull request #6614 from Shadow-Quill/Psyche-Turtleneck
Psychiatrists can now properly get the medical turtleneck via loadout
2020-01-15 20:08:31 -08:00
Atermonera
4b726189cc Merge pull request #6612 from Shadow-Quill/PDA-Ctrl-Click
Ctrl+Click now removes pens from PDAs
2020-01-15 20:06:40 -08:00
Shadow
36d10010dc Overtext Alert 2020-01-15 21:41:29 -06:00
Shadow
97bb7e3ff7 Multi-Updoot
Log Doot
RnD Doot
Binder Doot
Supply Doot
2020-01-15 16:59:18 -06:00
Shadow
eb3b297913 Components! 2020-01-15 16:58:35 -06:00
Ketrai
18bbffd969 Removes the fishmeat from the recipe. 2020-01-15 22:38:23 +01:00
Unknown
645ddf30d1 IP reputation checking
Ported from https://github.com/VOREStation/VOREStation/pull/6451
Code done by Aronai

Adds IP reputation checking to detect Tor, proxy, and VPN usage and block it if so configured.

It's disabled by default, but if enabled the default settings are to block all VPN/Proxy/Tor to connect unless the player has been a player for 5 days on a 'normal' connection so that people who legitimately sometimes use a VPN for *reasons* can continue to do so. You can also have it check reputations and just log bad ones, without disconnecting the users.

Whether or not it allows 'existing' players, the length of time they must have played, what's considered a 'bad' IP score, etc, are configurable. You **must** put an e-mail address if you use this, otherwise the service will likely ban you. This is the e-mail address they will send e-mails to if you're performing too many checks or they need to speak to you. 

Adds config options, here's a paste from the example config:
```
## IP Reputation Checking
# Enable/disable IP reputation checking (present/nonpresent)
#IP_REPUTATION

# Set the e-mail address problems can go to for IPR checks (e-mail address)
IPR_EMAIL whatever@whatever.com

# Above this value, reputation scores are considered 'bad' (number)
IPR_BAD_SCORE 1

# If you want the people disconnected. Otherwise it just logs. (present/nonpresent)
IPR_BLOCK_BAD_IPS

# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent)
IPR_ALLOW_EXISTING

# And what that age is (number)
IPR_MINIMUM_AGE 5
```

As you can see, it's off by default, so if you're a downstream this won't change anything for you unless you decide to turn it on. If you want the features, just copypaste the new config lines out of the example and uncomment IP_REPUTATION.

Downstreams can replace the /client/proc/update_ip_reputation() proc with your own, if you'd like to substitute your own service! Just set the client's ip_reputation var at the end of your proc.
2020-01-15 14:48:22 -05:00
ketraiski
9708c864a5 Have it your way travis 2020-01-15 16:43:27 +01:00
ketraiski
19c2155360 appease travis 2020-01-15 16:36:18 +01:00
ketraiski
f4c299f036 confused.jpg 2020-01-15 14:50:55 +01:00
ketraiski
33247b7aaa indentation fix attempt 2 2020-01-15 14:43:42 +01:00
ketraiski
4d42d212b8 indentation fix 2020-01-15 14:27:11 +01:00
ketraiski
31cd94617b Adds a chaos cake 2020-01-15 14:02:10 +01:00