Commit Graph

1538 Commits

Author SHA1 Message Date
Neerti
ba56f7951f Hopefully fixes conflicts. 2020-04-05 17:07:37 -04:00
Atermonera
3473522d5a Merge pull request #6904 from VOREStation/pol-cleanup
Clean up various things
2020-04-03 00:13:32 -07:00
Neerti
88b4e47e8b Fixes merge conflicts again. 2020-03-28 19:06:14 -04:00
Aronai Sieyes
715de43f35 VChat: Redone chat output done in Vue.js (#6761)
* Better notifications

* Add buttons to del/move tabs in edit mode

* Add a <span> to emotes

* Fix duplicate IDs in VChat and add more logging

* VChat: Redone chat output in Vue.js

* Ported tg asset cache

* VChat DME Update

* Replace \image macro with bicon()

* NanoUI Subsystem Fixes

Don't do this, the asset subsystem does this for you

* Allow narrate/globalnarrate shenanigans

Allows HTML if your entire thing is HTML

* Disable bicon() icon object cache, and create text tag cache

* Ore Scanner is written incorrectly

Only revealed by vchat

* Fixes 2 VChat bugs

* Underline links in VChat

* Fix LOOC color

* VChat Improvements

Hopefully, anyway.
- Arbitrary font size setting
- Line height setting
- Multiple crush settings
- Rewrote how tabs work hopefully for performance
- Hidden messages are actually put elsewhere
- Attempts to correct chat backlog restore on rejoin

* Surgery steps to use <span>

* Some VChat Tweaks

- Chat remains between client reconnects if your client didn't close (so things like using the reconnect button, or autoreconnects at round end when that feels like working)
- The client doesn't send pings to the server, the server sends pings to the client. This fixes AFK measurements for AFK kick purposes.
- Turn latency indicator into a green/red indicator to show if you're connected, and when clicked will perform a one-time ping (and block doing it again for 10 seconds). It will display '?ms' if it never got a reply, or '999ms' if it did, but it was over 1s.

* Include date in filename for VChat log save

* Merge pull request #6767 from Cyantime/patch-2

Change chat export naming scheme

* Adds VChat tab saving

Saves every time you enter/exit edit mode. Persists between rounds, VChat reloads via verb, etc.

* Fix chat exporting when someone has used unicode

Only affects clients still using 512

* Use CLIENT_FROM_VAR for ease of code reading

* Update code/modules/client/asset_cache.dm

Co-Authored-By: Novacat <35587478+Novacat@users.noreply.github.com>

* Fix runtime when client disconnects before vchat loads

* Fix polaris version of command reports

* Fix LOOC color in oldchat

* Put some styles in various adminpm messages

* Round info and advanced who spans

* Fix missing tag-end

* Maybe fix images for linux and statpanel but also doom everyone

Co-authored-by: ShadowLarkens <ShadowLarkens@users.noreply.github.com>
Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
2020-03-27 14:07:28 -07:00
Neerti
87c53a75af Updates to master and makes gravity event code be current. 2020-03-26 04:10:51 -04:00
Neerti
f5383410ea Events ported, now for cleanup if needed. 2020-03-26 03:20:16 -04:00
Aronai Sieyes
ad5f0485f7 Clean up things 2020-03-25 22:10:56 -04:00
Leshana
938384cb1b In fact lets use the constants instead of bare numbers for use_power everywhere. 2020-03-21 19:41:01 -04:00
Atermonera
22e28f29fe Merge pull request #6804 from Cerebulon/bigsounds
Big Bastard Incidental Sound Port
2020-03-15 11:38:44 -07:00
Aronai Sieyes
d391d9ab12 Mobs can be incorporeal (#6791)
* Mobs can be incorporeal

Prevents step noises, getting shot, etc. Basically living ghosts. Feel free to add more places this should check, but I think this is a majority.

* Fix missing incorporeal floatyness
2020-03-10 22:33:38 -07:00
Cerebulon
52e6669bf9 Big Bastard Incidental Sound Port 2020-03-08 23:25:45 +00:00
Atermonera
a4100b5b74 Merge pull request #6793 from Cerebulon/emlocksprite
Fixes shuttle emergency locker sprites
2020-03-08 12:21:16 -08:00
Aronai Sieyes
167f947e95 Boring minor things (#6792)
* Touch up bed/chair/stool icon updating

* Brighter permanent light

* Improve SMES icon handling

* Powernet cable nodes work on shuttles
2020-03-08 12:20:26 -08:00
Cerebulon
c6c7124583 Fixes emergency locker sprites 2020-03-07 10:10:00 +00:00
Aronai Sieyes
0dd194e047 Salvageable machines (#6768) 2020-03-03 13:44:31 -08:00
Heroman3003
95551e6e54 Fixes sofa not refunding any material (#6784) 2020-03-03 12:53:27 -08:00
Atermonera
999727b972 Merge pull request #6740 from Heroman3003/orangeyellow
Adds orange and yellow cloth materials
2020-02-26 17:25:43 -08:00
Atermonera
b988e8a3e2 Merge pull request #6729 from Mechoid/RailgunFixxo
Fix and tweak station Railguns.
2020-02-24 13:14:28 -08:00
Atermonera
dacf96b2ee Merge pull request #6701 from GeneriedJenelle/patch-1
Hide items in plant pots and plushies
2020-02-24 12:59:33 -08:00
Heroman
d02fec6e67 Adds orange and yellow cloth materials 2020-02-24 18:25:37 +10:00
Mechoid
af98219a50 Fix and tweak railguns. 2020-02-22 21:43:23 -08:00
GeneriedJenelle
98b354db2d Update flora.dm 2020-02-21 15:12:15 +00:00
Cerebulon
f801cc95be Allows precision placement of most items 2020-02-19 21:16:26 +00:00
Arokha Sieyes
5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
GeneriedJenelle
c8e0a8bd62 Update flora.dm 2020-02-17 17:14:17 +00:00
GeneriedJenelle
a978076576 Update flora.dm 2020-02-17 16:53:02 +00:00
Woodratt
5fa691e647 Update chairs.dm 2020-02-03 16:52:56 -08: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
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
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
Shadow
6088899908 Round One 2020-01-11 02:25:38 -06:00
Mechoid
d9076dbaff Xenoflora expansion take2 (#6592)
Xenoflora
2020-01-08 10:44:41 -08:00
Mechoid
daab287c51 GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-04 22:38:01 -08: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
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
Mechoid
f37b9e592b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into GlobSpecies
# Fix Conflicts:
#	code/modules/mob/living/simple_animal/animals/spiderbot.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	polaris.dme
2019-12-15 12:02:02 -08:00
Unknown
fbbf91b799 Updates travis, replaces lentext 2019-12-12 13:29:43 -05:00
Mechoid
58e2ce2fb4 Change various global species lists to GLOB versions. 2019-12-05 23:55:22 -08:00
Mechoid
7ecdcb40d2 Security / PseudoCargo Expansion (#6482)
* Security Expansion work.

* Weaponized Racism, Stowaways, Meteors

* Fix Fix. Prep modular armor for addition.

* Fix the boots.

* More modular armor work. Now in cargo!

* Fixfix

* Fixfix

* Thank you anxiety very cool.

* Make a Stowaway Antag

* FixFix
2019-11-24 17:22:25 -05:00
Mechoid
73795f40cd Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 17:37:17 -09:00
Unknown
7f4b35580d Blind port of Bay Radiation Subsystem
Figured I would do my part to move everything over to subsystems. Not tested yet.
2019-09-30 23:59:31 -04:00
Atermonera
7940fef4ba Merge pull request #6447 from TheFurryFeline/TFF-Orange_Is_The_New_Orange_Part_2
Orange Is The New Orange Part 2
2019-09-25 13:07:51 -08:00
Atermonera
8375a88575 Merge pull request #6404 from Heroman3003/flappening
Makes airtight plastic flaps unmakeable
2019-09-22 15:51:55 -08:00
Heroman
7fbd023440 Applies requested changes 2019-09-19 12:38:33 +10:00
TheFurryFeline
96e9358564 Orange Is The New Orange Part 2
Refactors prison jumpsuit slightly to not be a child of the orange jumpsuit, which in turn gets its own sprite. Left/right hand uniforms don't seem to be applying in-game when carrying the suits but that's not too bad of an issue. Uniform on the mob shows properly and works with sleeves rolled and uniform rolled down.
2019-09-07 12:30:41 -04:00
Atermonera
0da61521e1 Merge pull request #6435 from Novacat/nova-alerts
Fixes oversight with instruments
2019-09-02 22:54:06 -08:00
Atermonera
8388b6b56e Merge pull request #6434 from Heroman3003/hardening
Adds hardhats to engineering lockers
2019-08-31 14:12:24 -08:00
Novacat
7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Unknown
0312d93662 Fixes oversight with instruments 2019-08-31 14:29:55 -04:00