Bawhoppen 8b2a728291 Merge branch 'master' of https://github.com/tgstation/-tg-station into prisoners ...

# Conflicts:
#	_maps/map_files/BoxStation/BoxStation.dmm
#	code/datums/weather/weather_types/radiation_storm.dm
#	code/game/area/Space_Station_13_areas.dm

2020-02-14 21:28:55 -06:00

..

carbonpaper.dm

Ports carbon paper from Bay. (#47691)

2019-11-14 02:56:35 -08:00

clipboard.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

contract.dm

Completely removes cloning (#48668)

2020-02-04 16:04:06 -05:00

filingcabinet.dm

Makes raw HTML and browser datum popups UTF-8 aware (#49066)

2020-02-01 22:14:31 +01:00

folders.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

handlabeler.dm

Unicode awareness Part 2 -- copytext() (#48512)

2020-01-18 13:07:22 +13:00

paper_cutter.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

paper_premade.dm

prison

2020-02-07 02:24:50 -06:00

paper.dm

Unicode awareness Part 2 -- copytext() (#48512)

2020-01-18 13:07:22 +13:00

paperbin.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

paperplane.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

pen.dm

Further update_icon splitup (#48784)

2020-01-22 10:18:05 -05:00

photocopier.dm

[Ready] Adds a new RnD method, the B.E.P.I.S. (#48040)

2019-12-25 23:48:28 +01:00

stamps.dm

Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)

2019-10-08 11:06:02 -04:00

ticketmachine.dm

Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better.

2019-10-12 19:34:11 +03:00