CitadelStationBot 2ff65a8e39 [MIRROR] Lowers the chance for monkeys to become gorillas (#2476) ...

* Lowers the chance for monkeys to become gorillas

* Delete life.dm.rej

* Update life.dm

2017-08-29 00:59:34 -07:00

..

admin

Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191

2017-08-28 08:45:49 -05:00

assembly

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

atmospherics

here we go again (#2456)

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

awaymissions

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

cargo

here we go again (#2456)

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

chatter

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

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

client

Makes genitals_use_skintone save (#2514)

2017-08-27 04:22:04 -07:00

clothing

here we go again (#2456)

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

crafting

here we go again (#2456)

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

detectivework

here we go again (#2456)

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

emoji

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

error_handler

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

events

here we go again (#2456)

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

fields

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

flufftext

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

food_and_drinks

Merge branch 'master' into upstream-merge-29923

2017-08-28 09:19:44 -05:00

games

here we go again (#2456)

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

goonchat

Remove some unused goonchat stuff (#2481)

2017-08-24 18:29:50 -07:00

holiday

here we go again (#2456)

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

holodeck

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

html_interface

here we go again (#2456)

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

hydroponics

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

jobs

here we go again (#2456)

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

language

here we go again (#2456)

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

library

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

lighting

[MIRROR] Adds defines for mouse_opacity (#2381)

2017-08-21 20:29:37 -07:00

mapping

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

mentor

…

mining

Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect

2017-08-28 02:20:30 -05:00

mob

[MIRROR] Lowers the chance for monkeys to become gorillas (#2476)

2017-08-29 00:59:34 -07:00

modular_computers

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

ninja

here we go again (#2456)

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

orbit

…

paperwork

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

power

Fixes APC pixel shift being off

2017-08-28 02:20:25 -05:00

procedural_mapping

Removes the suppose-to-be unused shuttle wall path

2017-08-28 02:20:45 -05:00

projectiles

Merge branch 'master' into upstream-merge-29923

2017-08-28 09:19:44 -05:00

reagents

Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162

2017-08-28 08:54:01 -05:00

recycling

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

research

Fixes timestop spell (#2506)

2017-08-26 19:49:16 -07:00

ruins

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

security_levels

Removes a great amount of machinery copypasta with circuitboards.

2017-08-09 19:24:19 -05:00

server_tools

Makes IRC status return round id

2017-08-15 10:01:57 -05:00

shuttle

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

space_transition

…

spells

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

station_goals

here we go again (#2456)

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

stock_market

here we go again (#2456)

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

surgery

here we go again (#2456)

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

telesci

here we go again (#2456)

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

tgui

Unifies datum var definitions (#2237)

2017-08-03 06:02:58 -07:00

tooltip

…

uplink

Fixes surplus log icons.

2017-08-28 02:20:11 -05:00

vehicles

here we go again (#2456)

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

vore

here we go again (#2456)

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

VR

Removes a great amount of machinery copypasta with circuitboards.

2017-08-09 19:24:19 -05:00

zombie

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00