Commit Graph

29883 Commits

Author SHA1 Message Date
Neerti
00b24d93c8 Hopefully finalizes code work. 2020-02-20 21:48:58 -05:00
Neerti
54a75927ff Commiting my work before I do a stupid thing, just in case. 2020-02-20 21:21:38 -05:00
Atermonera
cecf3e49a2 Merge pull request #6667 from Heroman3003/voidsuti-surgery
Prevents surgery from being done while wearing a voidsuit
2020-02-10 13:01:34 -08:00
Heroman
e1c6b18bad Separates it into its own proc 2020-02-10 17:52:03 +10:00
Atermonera
27f693670b Merge pull request #6675 from GeneriedJenelle/patch-1
Logs graffiti and crayon drawings: Non-Cursed PR
2020-02-09 20:44:25 -08:00
Atermonera
af1929f74e Merge pull request #6662 from Shadow-Quill/Baton-Intent-Change
Stunbatons will now only harmbaton on grab/harm intents
2020-02-09 11:45:47 -08:00
Atermonera
40eaf71335 Merge pull request #6677 from Schnayy/atmfix
ATMs can now be emagged
2020-02-08 11:03:10 -08:00
Atermonera
cffdcb66b8 Merge pull request #6676 from Meghan-Rossi/machinefix
Fix frame deconstruction bugs
2020-02-08 11:03:02 -08:00
Atermonera
ea69d40480 Merge pull request #6673 from Cerebulon/refixskirts
Fixes Jumpskirt Sprites
2020-02-08 11:01:34 -08:00
Atermonera
792245aef6 Merge pull request #6665 from Woodratt/02022020_civilianmaptweak
2020 Civilian Wing Overhaul
2020-02-08 10:55:00 -08:00
Schnayy
84f2d2902a makes atms emaggable 2020-02-07 00:26:56 -06:00
GeneriedJenelle
2b99bf2adb Update configuration.dm 2020-02-07 01:11:27 +00:00
Meghan-Rossi
c48f1d1f93 Fix frame deconstruction bugs
*Fix machines eating components if you put them in and then cut the wires.
*Fix descriptions of frames showing the requirements of the last board that was in them even after taking it out.
2020-02-07 00:57:27 +00:00
GeneriedJenelle
196850b5c7 finally makes it a config option
should be ready now.
2020-02-07 00:56:51 +00:00
GeneriedJenelle
0eb2377c35 adds config file var 2020-02-07 00:55:33 +00:00
GeneriedJenelle
f5e86a7f38 Logs graffiti and crayon drawings: Non-Cursed PR
I will try to not do voo-doo somehow this time.
2020-02-07 00:51:18 +00:00
Cerebulon
59d3ba0182 Fixes jumpskirt sprites borked by world server clothing expansion port 2020-02-06 01:35:46 +00:00
Mechoid
c6082f7c5a Fix issues introduced by the world server icon system port. 2020-02-03 20:29:35 -08:00
Atermonera
4b6c0d7a83 Merge pull request #6664 from PrismaticGynoid/loadouttoys
Adds some toys to the loadout
2020-02-03 17:49:54 -08:00
Atermonera
80a07277f1 Merge pull request #6653 from zekesulastin/disable-stat-tracking
Changes DBCore connection procs to check for config value SQL_ENABLED instead of ENABLE_STAT_TRACKING
2020-02-03 17:48:44 -08:00
Woodratt
5fa691e647 Update chairs.dm 2020-02-03 16:52:56 -08:00
Heroman
2e230617ba Restricts surgery through voidsuits 2020-02-04 09:59:22 +10:00
Woodratt
512fe09064 2020 Civilian Overhaul
- Added sofas (no options to build one in round yet, will be added after this pull).
- Add neonsigns, currently one neon sign, Cafe. (Code is copy pasta from holosigns).
- Add boxes with mugs and cups.
- Neon signs and holosigns now emit light while on.
- Merged the Coffee Shop with the Library.
- Moved the Locker Room to where the Coffee Shop was, adjusted the holodeck.
- Old Locker Room turned into a construction area.
- Adjusted holodeck maps to new orientation.
- Changed sprite of barcode scanner.
- Cleaned up furniture icon dmi, fixed arm rest icons for shuttle chairs.
2020-02-02 23:58:26 -08:00
Atermonera
31340ad244 shutoff valves actually find leaks before they decide to close (#6660) 2020-02-02 14:17:15 -08:00
Atermonera
acf5b7d836 Unregulated passive regulators don't limit flow (#6657) 2020-02-02 14:09:28 -08:00
PrismaticGynoid
f8ffd25caf Adds some toys to the loadout
Adds a few toys, including action figures, to the loadout. Also fixes water flowers being unrefillable.
2020-02-01 20:16:30 -08:00
Atermonera
445b6cfaf0 Merge pull request #6661 from LeighKnapenberger/patch-1
Fixes killer tomato mutation
2020-02-01 15:08:13 -08:00
Atermonera
139c4a3d70 Merge pull request #6658 from Darlantanis/TeshariPonchoFix
Teshari Poncho Fix
2020-02-01 15:00:22 -08:00
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
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