CitadelStationBot cd122501fc Refactors blood regeneration from nutriment (#839) ...

* Refactors blood regeneration from nutriment

* Update blood.dm

* Delete blood.dm.rej

* Update blood.dm

2017-05-18 00:03:51 -05:00

..

admin

Fixes spelling on the EM Pulse action

2017-05-17 05:01:25 -05:00

assembly

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

atmospherics

rej cleanup

2017-05-17 03:50:34 -05:00

awaymissions

Fixes wizard academy spawner. (#892)

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

cargo

Fixes engraved messages

2017-05-14 14:50:49 -05:00

chatter

…

client

rej cleanup

2017-05-17 03:50:34 -05:00

clothing

Merge pull request #898 from LetterJay/master

2017-05-12 16:24:17 -04:00

crafting

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

detectivework

Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars

2017-05-04 17:54:47 -05:00

emoji

…

error_handler

Persistent investigate and game logs separated by round ID

2017-05-02 18:47:58 -05:00

events

applies the previous fixes for cult on a closed PR

2017-05-16 22:59:41 -05:00

flufftext

Adds death checks to two hallucinations, preventing the dead from spasming

2017-04-28 21:04:00 -05:00

food_and_drinks

Merge pull request #938 from Citadel-Station-13/upstream-merge-27169

2017-05-14 16:30:35 -04:00

games

…

holiday

…

holodeck

rej cleanup

2017-05-02 04:56:46 -05:00

html_interface

…

hydroponics

Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband

2017-05-15 17:04:23 -05:00

jobs

[MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935)

2017-05-14 20:18:02 -07:00

language

language holder for constructs

2017-05-17 10:20:12 -05:00

library

Fixes engraved messages

2017-05-14 14:50:49 -05:00

lighting

More /vg/lighting tweaks (#884)

2017-05-10 16:11:22 -07:00

mapping

Fixes some things not using log_world

2017-05-09 09:44:18 -05:00

mentor

…

mining

Fixes the ore redemption machine's sheet amount upgrade

2017-05-14 18:43:32 -05:00

mob

Refactors blood regeneration from nutriment (#839)

2017-05-18 00:03:51 -05:00

modular_computers

Changes ID card program to only require head of staff access to download

2017-04-27 06:36:48 -05:00

ninja

…

orbit

…

paperwork

Merge pull request #945 from Citadel-Station-13/upstream-merge-27180

2017-05-14 16:29:01 -04:00

power

Merge pull request #974 from Citadel-Station-13/upstream-merge-27246

2017-05-17 10:48:40 -04:00

procedural_mapping

…

projectiles

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

reagents

Refactors blood regeneration from nutriment (#839)

2017-05-18 00:03:51 -05:00

recycling

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

research

Merge pull request #854 from Citadel-Station-13/upstream-merge-27036

2017-05-14 16:39:28 -04:00

ruins

Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973)

2017-05-14 20:12:00 -07:00

security_levels

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

2017-05-02 05:13:49 -05:00

shuttle

Merge branch 'master' into upstream-merge-26776

2017-05-17 05:14:18 -04:00

space_transition

…

spells

Cryo icon state and Wizard tweaks (#975)

2017-05-17 23:36:50 -05:00

station_goals

rej cleanup

2017-05-02 04:56:46 -05:00

stock_market

…

surgery

ook ook language

2017-05-17 10:15:30 -05:00

telesci

New() goes in the trash, we've gotta Initialize()

2017-04-26 17:15:48 -05:00

tgui

Moves languages to a holder datum, gives mind its own language holder

2017-05-05 08:13:04 -05:00

tooltip

…

uplink

adds the holoparasite box, and adds it to traitor uplinks (#913)

2017-05-14 20:36:22 -07:00

vehicles

rej cleanup

2017-05-02 04:56:46 -05:00

vore

…

VR

Changes /obj/machinery to have atom/movable occupants

2017-05-01 15:58:52 -05:00

zombie

Merge pull request #640 from Citadel-Station-13/upstream-merge-26527

2017-05-13 01:24:55 -04:00