Tad Hardesty a55d2e7ff7 Show the correct coordinates when a pulse rifle prize is found (#34089)

2018-01-05 06:03:05 -06:00

..

admin

Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032

2018-01-03 04:57:12 -06:00

assembly

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

atmospherics

Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00

awaymissions

CTF flags are no longer locked to CTF. (#33874)

2017-12-29 00:29:42 -06:00

cargo

Defines math, take 2

2017-12-17 10:02:43 -06:00

chatter

…

client

Merge pull request #34025 from DaxDupont/PDAColor

2018-01-03 21:12:09 -06:00

clothing

Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967

2018-01-02 19:15:46 -06:00

crafting

[READY]Refactors reagent container types

2017-12-18 22:54:51 -06:00

detectivework

Update detective_work.dm

2017-12-29 18:39:28 -06:00

emoji

…

error_handler

…

events

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

fields

Adds colour shift to timestop (#33847)

2017-12-29 02:53:37 -06:00

flufftext

Hallucinations no longer show open doors "bolting" (#33859)

2017-12-27 08:26:16 -06:00

food_and_drinks

Merge pull request #33948 from ShizCalev/abstract-frying

2017-12-31 10:01:38 -06:00

games

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

goonchat

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

holiday

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00

holodeck

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

integrated_electronics

Merge pull request #34038 from ShizCalev/text-pad

2018-01-03 07:35:17 -06:00

jobs

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

keybindings

oops

2017-12-27 07:08:26 -06:00

language

Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405

2017-12-21 03:42:38 +00:00

library

adds world.realtime to soapstone

2017-12-24 15:03:22 -06:00

lighting

Defines math, take 2

2017-12-17 10:02:43 -06:00

mapping

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

mentor

…

mining

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

mob

Merge pull request #4643 from Citadel-Station-13/upstream-merge-34033

2018-01-03 18:54:12 +00:00

modular_computers

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

ninja

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

NTNet

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

orbit

Update orbit.dm

2017-12-29 18:41:57 -06:00

paperwork

more save points

2017-12-29 00:07:36 -06:00

power

Fixes white power cables in DM (#34066)

2018-01-04 20:16:31 -06:00

procedural_mapping

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

projectiles

Show the correct coordinates when a pulse rifle prize is found (#34089)

2018-01-05 06:03:05 -06:00

reagents

You can taste oil (#34046)

2018-01-03 15:06:54 -06:00

recycling

Merge branch 'master' into upstream-merge-33498

2017-12-19 17:50:11 -06:00

research

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

ruins

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

security_levels

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

server_tools

Update st_interface.dm

2017-12-18 15:24:23 -06:00

shuttle

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

space_transition

also syncs a bunch of shit

2017-12-29 04:12:43 -06:00

spells

Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003

2018-01-02 17:13:31 -06:00

station_goals

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

stock_market

…

surgery

also syncs a bunch of shit

2017-12-29 04:12:43 -06:00

telesci

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

tgui

Brain Traumas

2017-12-06 12:05:20 -06:00

tooltip

Merge pull request #33396 from AnturK/tooltip-fix

2017-12-10 10:26:44 -06:00

uplink

Internal radio implant

2017-12-29 02:52:24 -06:00

vehicles

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

vore

[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)

2017-12-11 16:36:38 -08:00

VR

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

zombie

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00