Commit Graph

15532 Commits

Author SHA1 Message Date
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
cffdcb66b8 Merge pull request #6676 from Meghan-Rossi/machinefix
Fix frame deconstruction bugs
2020-02-08 11:03:02 -08:00
Atermonera
792245aef6 Merge pull request #6665 from Woodratt/02022020_civilianmaptweak
2020 Civilian Wing Overhaul
2020-02-08 10:55:00 -08: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
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
Atermonera
4b6c0d7a83 Merge pull request #6664 from PrismaticGynoid/loadouttoys
Adds some toys to the loadout
2020-02-03 17:49:54 -08:00
Woodratt
5fa691e647 Update chairs.dm 2020-02-03 16:52:56 -08:00
Heroman
bf8cf75785 Applies same restrictions as first aid to external synth repair 2020-02-04 09:17:09 +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
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
Shadow
607268a756 The change 2020-01-31 22:05:22 -06:00
Amunak
b8385aa417 Makes countable lists newline-separated, keeping inline as a separate "preset" proc 2020-01-30 01:24:40 +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
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
Rykka Stormheart
8e2fe745d8 Serenity Mech Fix for gygax armor plates. (#6641) 2020-01-23 20:55:16 -08:00
Atermonera
af635d0978 Merge pull request #6640 from TheFurryFeline/patch-5
Aaaa, typo fixy
2020-01-21 15:13:49 -08:00
Atermonera
9684db1fe4 Merge pull request #6636 from SpaceManiac/patch/syntax
Fix various syntactic problems
2020-01-20 22:05:25 -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
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
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
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
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
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
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
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
ketraiski
31cd94617b Adds a chaos cake 2020-01-15 14:02:10 +01:00
Shadow
46d7ca5d31 Round Two 2020-01-11 11:53:07 -06:00
Shadow
6088899908 Round One 2020-01-11 02:25:38 -06:00
Shadow
e018d59641 Ding! 2020-01-10 23:04:54 -06:00
Shadow-Quill
e0774cceef Web Edit 2020-01-10 12:05:31 -06:00
Atermonera
c100cca81a Merge pull request #6606 from Heroman3003/kernel-im-dummy-thick-and-clamp-of-my-code-breaks-breathing
Fixes clamp being used with wrong syntax in places
2020-01-09 22:09:05 -08:00
Shadow
2ab0bbe468 Adds the CTRL+Click to get pens out 2020-01-09 16:48:11 -06:00
Mechoid
d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
Heroman
01c853526b Fixes clamp being used with wrong syntax in places 2020-01-06 08:32:08 +10:00
Mechoid
daab287c51 GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-04 22:38:01 -08:00
Heroman
5ef1a972c9 Fixes AI not being able to escape out of energy nets 2019-12-29 08:36:19 +10:00
Cerebulon
f3e3703aae Coffee Shop Revamp (#6559)
* Adds bagels and decaf coffee

* Remaps the coffee shop to be a bit more appealing to visit.

* Map merge fuckery.

* Map merge fuckery. also changelog.

* took out blank line just in case

* why did the dmi do that

* revert unintended revert
2019-12-22 19:53:11 -08:00
Atermonera
11a8f3ef82 Merge pull request #6580 from Shadow-Quill/APC-AirAlarm-Alt-Click
APCs/Air Alarms can be (un)locked via altclick
2019-12-21 22:57:59 -08:00
Atermonera
e749b79026 Fixes mech projectile armor thinking test projectiles are dangerous (#6480)
* Fixes mech projectile armor thinking test projectiles are dangerous

* Actually adds some files to polaris.dme
2019-12-21 20:56:24 -08:00
Shadow
c10aade16f The Altening 2019-12-20 23:02:32 -06:00
TheFurryFeline
3474870177 Light Replacer QOL
Tweaks light replacers to allow automatic replacing of broken bulbs in a light fixture. Also lets you shove bulbs into said objects. Ported from Yogastation with code used from https://github.com/CHOMPstation/CHOMPstation/pull/517. If there's a better way to code this, do tell me. It works, however.

Changelog notes:

- Light replacer now uses broken lights instead of dropping them
- Every 4 broken lights switched refills the light replacer with 1 new bulb
- You can now also use a box of lights on the light replacer to refill it (the old method of using the light replacer on the box still works)
2019-12-16 10:34:54 -05:00
Atermonera
f14184f105 Merge pull request #6558 from Mechoid/GlobSpecies
Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-15 21:51:05 -08:00