kevinz000 4ad56ac1e2 Merge pull request #9614 from Trilbyspaceclone/patch-234 ...

Lowers ghosts and insain clowns hp to 120 from 1e6

2019-11-14 16:07:43 -07:00

..

admin

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

antagonists

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

assembly

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

atmospherics

Merge pull request #9632 from Ghommie/Ghommie-cit281

2019-11-14 15:58:53 -07:00

awaymissions

Merge pull request #9453 from Ghommie/Ghommie-cit226

2019-11-14 15:47:18 -07:00

bsql

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

buildmode

…

cargo

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

chatter

…

client

Merge pull request #9453 from Ghommie/Ghommie-cit226

2019-11-14 15:47:18 -07:00

clothing

Merge pull request #9554 from NopemanMcHalt/assu

2019-11-14 15:43:51 -07:00

crafting

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290

2019-11-10 23:17:58 +01:00

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

fields

…

flufftext

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

food_and_drinks

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

games

…

goonchat

…

holiday

Merge pull request #9614 from Trilbyspaceclone/patch-234

2019-11-14 16:07:43 -07:00

holodeck

Merge pull request #9632 from Ghommie/Ghommie-cit281

2019-11-14 15:58:53 -07:00

hydroponics

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

integrated_electronics

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

jobs

…

keybindings

…

language

…

library

…

lighting

…

mapping

…

mining

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

mob

Merge pull request #9632 from Ghommie/Ghommie-cit281

2019-11-14 15:58:53 -07:00

modular_computers

Fixing a few throw_at calls and modular computer processors Init.

2019-11-04 00:12:41 +01:00

ninja

oh flak.

2019-11-03 17:29:53 +01:00

NTNet

…

oracle_ui

…

paperwork

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

photography

…

power

Merge pull request #9632 from Ghommie/Ghommie-cit281

2019-11-14 15:58:53 -07:00

procedural_mapping

…

projectiles

Merge pull request #9688 from Ghommie/Ghommie-cit306

2019-11-14 15:51:20 -07:00

reagents

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

recycling

Merge pull request #9632 from Ghommie/Ghommie-cit281

2019-11-14 15:58:53 -07:00

research

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

ruins

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

security_levels

…

shuttle

Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII

2019-11-14 16:00:45 -07:00

spells

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00

station_goals

…

surgery

Merge pull request #9663 from Trilbyspaceclone/patch-235

2019-11-14 15:54:38 -07:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Merge pull request #9656 from Ghommie/Ghommie-cit290

2019-11-14 15:55:04 -07:00

vehicles

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290

2019-11-10 23:17:58 +01:00

vending

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290

2019-11-10 23:17:58 +01:00

vore

…

VR

…

zombie

Dreamchecker compatibility changes, part 1.

2019-11-10 20:48:30 +01:00