Jordan Brown d3dcc118ec Merge pull request #31340 from Firecage/codeshitnotshit ...

Does some code standardization/consistency.

2017-10-05 15:53:11 -04:00

..

admin

merge conflict fix

2017-10-05 11:22:57 +02:00

assembly

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

atmospherics

Merge pull request #31208 from ShizCalev/AINT-NOTHIN-BUT-A-FIRE-STARTA

2017-10-04 12:12:49 +13:00

awaymissions

merge conflict fix

2017-10-05 11:22:57 +02:00

cargo

Adds some new plushies (#30751)

2017-09-20 08:53:21 +12:00

chatter

fixed sounds for nuke, redbutton, and talking action figure

2017-08-22 20:15:04 -06:00

client

merge conflict fix

2017-10-05 11:22:57 +02:00

clothing

Merge pull request #31340 from Firecage/codeshitnotshit

2017-10-05 15:53:11 -04:00

crafting

Fix clothing crafting menu for realsies (#30776)

2017-09-16 17:02:16 -04:00

detectivework

merge conflict fix

2017-10-05 11:22:57 +02:00

emoji

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

error_handler

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

events

Fixes/tweaks wormholes event and portals (#30846)

2017-10-03 11:37:16 +02:00

fields

[READY]Refactors timestops to use fields (#30858)

2017-09-29 15:46:10 +13:00

flufftext

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

food_and_drinks

merge conflict fix

2017-10-05 11:22:57 +02:00

games

merge conflict fix

2017-10-05 11:22:57 +02:00

goonchat

merge conflict fix

2017-10-05 11:22:57 +02:00

holiday

Removes old debug text

2017-09-19 18:56:39 -04:00

holodeck

merge conflict fix

2017-10-05 11:22:57 +02:00

html_interface

Does some code standardization/consistency

2017-10-05 11:13:47 +02:00

hydroponics

merge conflict fix

2017-10-05 11:22:57 +02:00

jobs

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

language

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

library

Merge pull request #31275 from kingofkosmos/moredeconhints

2017-10-05 10:33:09 +13:00

lighting

Fixes lighting hard deleting (#30684)

2017-09-14 12:20:28 +02:00

mapping

Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it (#29859)

2017-08-30 10:10:42 +12:00

mining

Merge pull request #31340 from Firecage/codeshitnotshit

2017-10-05 15:53:11 -04:00

mob

Merge pull request #31340 from Firecage/codeshitnotshit

2017-10-05 15:53:11 -04:00

modular_computers

ismachinery define

2017-10-03 18:13:21 -05:00

ninja

Merge pull request #31289 from ShizCalev/hacknslash

2017-10-04 21:24:44 -03:00

orbit

…

paperwork

merge conflict fix

2017-10-05 11:22:57 +02:00

power

merge conflict fix

2017-10-05 11:22:57 +02:00

procedural_mapping

Makes the station Z level into a list instead of a single define (#30297)

2017-09-11 13:39:52 -04:00

projectiles

merge conflict fix

2017-10-05 11:22:57 +02:00

reagents

merge conflict fix

2017-10-05 11:22:57 +02:00

recycling

merge conflict fix

2017-10-05 11:22:57 +02:00

research

merge conflict fix

2017-10-05 11:22:57 +02:00

ruins

Ashwalker tendrils now drop everything on victims before consuming (#31177)

2017-10-01 15:21:23 -05:00

security_levels

Configuration datum refactor (#30763)

2017-09-29 15:36:51 +13:00

server_tools

Server tools API update to 3.1.0.1

2017-10-02 10:58:44 -04:00

shuttle

merge conflict fix

2017-10-05 11:22:57 +02:00

space_transition

…

spells

merge conflict fix

2017-10-05 11:22:57 +02:00

station_goals

Makes the station Z level into a list instead of a single define (#30297)

2017-09-11 13:39:52 -04:00

stock_market

merge conflict fix

2017-10-05 11:22:57 +02:00

surgery

merge conflict fix

2017-10-05 11:22:57 +02:00

tgui

Unifies datum definitions

2017-08-01 15:51:26 -04:00

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 14:57:28 +02:00

uplink

Makes magillitis affect all Hominidae. (#30841)

2017-09-20 09:05:03 -05:00

vehicles

Replaced flags with flags_1

2017-08-16 13:01:15 -06:00

VR

Adds missing span-endings (#30494)

2017-09-11 14:09:53 +02:00

zombie

Zombies now stay dead if they suicide (#30941)

2017-09-23 20:32:44 +10:00