GS13NG

Files

John Ginnane 6720fc3713 Newly crafted stacks are merged with held stacks of the same type (#33971 )

* Merge newly crafted stacks with held stacks

* Update code

2018-01-07 20:28:46 -06:00

admin

Adds ban option for team antags (#34116 )

2018-01-06 08:52:31 -06:00

assembly

…

atmospherics

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

awaymissions

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

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

cargo

…

chatter

…

client

Merge pull request #34025 from DaxDupont/PDAColor

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

clothing

many flashes??

2018-01-07 02:07:39 -06:00

crafting

…

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

…

food_and_drinks

Fix bug with smashing bottles on throw (#34077 )

2018-01-05 06:01:44 -06:00

games

…

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

…

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

Merge pull request #34127 from tgstation/Cyberboss-patch-7

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

keybindings

…

language

…

library

…

lighting

…

mapping

Fix away missions taking 2+ minutes to load (#34084 )

2018-01-05 06:01:52 -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

Newly crafted stacks are merged with held stacks of the same type (#33971 )

2018-01-07 20:28:46 -06:00

modular_computers

Replace explicit z-level checks with defines

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

ninja

…

NTNet

…

orbit

Update orbit.dm

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

paperwork

…

power

Removed some superfluous stack code (#34083 )

2018-01-05 06:01:36 -06:00

procedural_mapping

Replace explicit z-level checks with defines

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

projectiles

Update projectile.dm

2018-01-07 15:20:59 -05:00

reagents

Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp

2018-01-07 11:02:49 -06:00

recycling

…

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

…

security_levels

Replace explicit z-level checks with defines

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

server_tools

…

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

Fixes infernal jaunt causing devils to get stuck if interrupted (#34056 )

2018-01-05 06:05:16 -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

…

tgui

…

tooltip

…

uplink

Internal radio implant

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

vehicles

…

vore

…

zombie

…