CitadelStationBot adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) ...

* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm

2017-10-21 06:10:22 -05:00

..

admin

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

assembly

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

atmospherics

[MIRROR] Fixes #31897 , cryo base disappearing (#3534)

2017-10-21 03:46:17 -05:00

awaymissions

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

cargo

Improve extended examination text for many objects (#31381)

2017-10-10 03:07:38 -05:00

chatter

Fixes sounds for toy nuke, red button, and talking action figures (#2475)

2017-08-24 18:31:24 -07:00

client

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

clothing

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

crafting

[MIRROR] Ammo cleanup (#2643)

2017-09-22 22:30:44 -05:00

detectivework

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

emoji

Configuration datum refactor

2017-09-28 21:37:53 -05:00

error_handler

[MIRROR] Hacky temp workaround of byond bug preventing logging of stack overflow runtimes (#3512)

2017-10-21 03:47:34 -05:00

events

Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528

2017-10-12 07:19:30 -04:00

fields

expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode (#31778)

2017-10-19 04:57:49 -05:00

flufftext

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

food_and_drinks

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

games

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

goonchat

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

holiday

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

holodeck

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

html_interface

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

hydroponics

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

jobs

Update silicon.dm

2017-09-29 23:44:43 -05:00

language

here we go again (#2456)

2017-08-24 19:24:25 -07:00

library

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

lighting

Merge pull request #3374 from Citadel-Station-13/upstream-merge-31635

2017-10-14 10:20:36 -04:00

mapping

makes loaded templates call air_update_turf() on bordering turfs (#31738)

2017-10-15 19:34:33 -05:00

mentor

…

mining

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

mob

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

modular_computers

Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers

2017-10-14 18:48:13 -05:00

ninja

Removes a bunch of sleeps/spawns and makes a few booleans defines

2017-10-14 18:53:48 -05:00

orbit

TG sync Sunday (#201)

2017-02-06 00:36:56 -06:00

paperwork

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

power

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

procedural_mapping

Makes the station Z level into a list instead of a single define

2017-09-11 12:40:35 -05:00

projectiles

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

reagents

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

recycling

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

research

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

ruins

[MIRROR] Fixes conflicting IDs on ruined whiteship (#3525)

2017-10-21 03:44:47 -05:00

security_levels

Configuration datum refactor

2017-09-28 21:37:53 -05:00

server_tools

Update server tools API to 3.1.0.2 (#31451)

2017-10-09 19:02:47 -05:00

shuttle

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

space_transition

April sync (#360)

2017-04-13 23:37:00 -05:00

spells

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

station_goals

Fix many instances of "the the"

2017-10-13 09:41:54 -05:00

stock_market

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

surgery

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

telesci

here we go again (#2456)

2017-08-24 19:24:25 -07:00

tgui

Fixes AI visiblity checks (#31819)

2017-10-19 05:42:52 -05:00

tooltip

Strip propriety macros from tooltips (#31113)

2017-09-30 08:03:28 -05:00

uplink

readds guardians to the uplink (#31616)

2017-10-14 15:19:19 -05:00

vehicles

Remove drop_item, drop_item_v, put_in_hands_or_del

2017-10-07 12:37:06 -05:00

vore

Fixes vore complaints with one weird trick (#3535)

2017-10-21 03:45:17 -05:00

VR

Merge branch 'master' into upstream-merge-30494

2017-09-12 02:40:24 -05:00

zombie

[MIRROR] Zombies now stay dead if they suicide (#2914)

2017-09-23 05:54:36 -05:00