Commit Graph

32310 Commits

Author SHA1 Message Date
Atermonera
33926742a5 Merge pull request #6656 from Amunak/countable-lists
Prettifies closet contents list with (newly added) countable variant of english_list
2020-02-01 14:59:37 -08:00
Cerebulon
80f81b8725 Fixes antibiotic resistance being reset when copied to new datum instance (#6654) 2020-01-31 20:45:38 -08:00
Shadow
607268a756 The change 2020-01-31 22:05:22 -06:00
LeighKnapenberger
44d4986a2e Update seed_datums.dm 2020-01-31 00:16:22 -05:00
Atermonera
80bc4bdfae Merge pull request #6652 from Rykka-Stormheart/shep-dev-missing-no
Hacky Fix for Athletic Shorts showing Missing Icon
2020-01-30 16:23:25 -08:00
Amunak
b8385aa417 Makes countable lists newline-separated, keeping inline as a separate "preset" proc 2020-01-30 01:24:40 +01:00
Amunak
860a280d24 Fixes non-atoms in counting_english_list not having count shown 2020-01-29 22:01:55 +01:00
Amunak
be8afe95b0 Separates "counting english list" to its own proc
The code is two distinct branches anyway, might as well be like this.
2020-01-29 17:23:24 +01:00
Nadyr
26b5e7aedb -Adds a metamorphic pint glass
-Adds said glass to the booze-o-mat
-Adds the icon for said glass
-Fixes metaglass icons for mojito and goldschlager
2020-01-28 23:33:22 -05:00
Nadyr
71f69815e7 Sets icon override to use teshari sprites when ponchos are worn by teshari. Otherwise it just uses ties.dmi as normal. 2020-01-28 22:19:36 -05:00
Amunak
3a5448f741 Prettifies closet contents list with (now added) countable english_list
Contents of closets (as viewed by ghosts) are now less ugly and easier to read.

- Adds reusable option to have english_lists count the contents and
display them (optionally with icons and specific determiners).
- Due to backwards compatibility these options are NOT available for
non-countable lists; this was originally planned, but it's not easily
possible unless all usage of english_list is revised.
- Moves the ghost examine code to proc/examine where it belongs.
- Ghosts now also see empty/full messages like characters standing
close do.
- The contents list for closets now shows number of items (if multiple)
and their icons (wherever possible).
- The list no longer shows unnecessary determiners ("the" before every
single item).
- Old usage of english_list still uses the old code. New code could
change order of the strings where it matters (in weather reports or
camera network assembly code, for example), so it cannot be used.
2020-01-29 00:59:26 +01:00
Atermonera
3af55c5f89 Merge pull request #6651 from Cerebulon/ClothingExpansionPort
Ports Clothing Expansion Code from World Server
2020-01-28 11:15:31 -08:00
Atermonera
29b7736e14 Merge pull request #6650 from Shadow-Quill/Stacker-Runtime-Fix
Fixes constant stacking machine runtimes
2020-01-28 11:12:35 -08:00
ZekeSulastin
21b78fcde9 Changes DBCore connection procs to check for config value SQL_ENABLED instead of ENABLE_STAT_TRACKING. 2020-01-27 22:25:46 -05:00
Rykka
96c2265577 Hacky Fix for Athletic Shorts showing Missing Icon
Athletic Shorts (standalone) have the redshorts icon.
2020-01-27 19:21:03 -07:00
Cerebulon
7b9cf01c5c Ports clothing expansion code from worldserver 2020-01-26 04:45:57 +00:00
Atermonera
09a8cde7af Merge pull request #6603 from Rykka-Stormheart/shep-dev-sm-delam-alarm
Add an audible alarm sound to SM Delamination
2020-01-25 19:25:04 -08:00
Atermonera
59b0fe497b Merge pull request #6649 from Trexdude/patch-1
Fixes Bagel Poppy Recipe
2020-01-25 19:16:05 -08:00
Atermonera
bd7271db07 Merge pull request #6637 from Mechoid/AugmentsRespectBeds
Augments Respect Beds, Robotic
2020-01-25 19:12:39 -08:00
Shadow
ebe2fdfad8 Fixx 2020-01-25 20:23:25 -06:00
Trexdude
298c9a5f0f Fixes Bagel Poppy Recipe
Such that crafting it using a microwave actually spawns a poppy bagel, instead of a raisin bagel.
2020-01-24 18:38:06 -05:00
Rykka Stormheart
8e2fe745d8 Serenity Mech Fix for gygax armor plates. (#6641) 2020-01-23 20:55:16 -08:00
Atermonera
d0a488d9a7 Preset (mapped-in) modular computers now have printers by default. (#6639) 2020-01-23 20:54:48 -08:00
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