Neerti
00fa623c9d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/machinery/Sleeper.dm
code/game/machinery/computer/communications.dm
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/global.dm
code/modules/materials/materials.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/projectiles/guns/projectile/automatic.dm
polaris.dme
2015-08-23 01:30:46 -04:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
PsiOmegaDelta
56523d0941
Cleans out (mostly) unused access definitions and makes access lists sorted.
2015-08-21 14:45:45 +02:00
Zuhayr
c8b6813426
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
...
Uplink Items - Part III
2015-08-20 19:19:12 +09:30
Zuhayr
0e4c2430d1
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2015-08-18 11:59:50 -07:00
Zuhayr
71214d859e
Merge with master.
2015-08-18 11:31:10 -07:00
mwerezak
dadc6e4b77
Adds logging for admin spawning antags
2015-08-17 21:10:24 -04:00
Kelenius
aa318b8d1c
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
PsiOmegaDelta
0380d5d9d4
Completes the feature where mercenaries can setup fake crew announcements and records.
2015-08-14 13:42:11 +02:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
PsiOmegaDelta
db565ae2ff
Merge remote-tracking branch 'upstream/dev' into 150703-Uplinkery
...
Conflicts:
code/datums/datacore.dm
code/defines/obj.dm
2015-08-13 08:11:32 +02:00
Kelenius
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
PsiOmega
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
PsiOmega
862fad60c2
Fixes #10488 .
...
A simple matter if incorrect type definition.
2015-08-11 19:36:02 +02:00
PsiOmegaDelta
211a427d65
Crew monitor balance and lag fixes.
...
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
2015-08-11 09:27:18 +02:00
Neerti
95240c989b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/3/2015_bay_sync
...
Conflicts:
polaris.dme
2015-08-03 22:13:18 -04:00
PsiOmega
f8d86900a5
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/new_player/preferences_setup.dm
code/setup.dm
2015-08-01 19:45:42 +02:00
Mloc
f04ca77bfb
revert chargen rendering rework
...
fixes #9733
Signed-off-by: Mloc <colmohici@gmail.com >
2015-08-01 11:35:53 +01:00
PsiOmegaDelta
9e46dfbb56
Re-arranges data record and crew arrival announcement code.
2015-07-28 11:27:44 +02:00
Neerti
94a2ec5bf1
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-26 16:01:27 -04:00
PsiOmegaDelta
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02:00
Chinsky
390bf93d4d
Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering
...
Fixes #10254 .
2015-07-23 21:01:33 +03:00
PsiOmegaDelta
39a1b3e4ab
Merge pull request #10272 from Baystation12/dev-freeze
...
Dev freeze -> Dev
2015-07-23 08:14:39 +02:00
Kelenius
b83afb10f8
Moves supply pack check down to atom
2015-07-22 13:05:26 +03:00
Kelenius
b637030c21
Fixes #9209 - cargo manifests don't show contents
...
This is a correct way of using initial() with a prototype that doesn't
create a new object
2015-07-22 10:35:22 +03:00
PsiOmegaDelta
ec3faf35e8
Fixes #10254 .
...
Nothing to see here.
2015-07-22 08:11:52 +02:00
GinjaNinja32
0c1aee8074
Fixes <span class='class>, makes Travis check it
2015-07-18 21:13:32 +01:00
Neerti
6eece8ac45
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/16/2015_bay_merge_2
...
Conflicts:
.travis.yml
polaris.dme
2015-07-16 22:46:53 -04:00
Zuhayr
c779482afc
Merge with dev.
2015-07-15 16:20:39 +09:30
PsiOmegaDelta
cb1e57eb4e
Law spelling corrections, removes some law sets from the law manager overview.
2015-07-14 09:01:13 +02:00
PsiOmegaDelta
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
Zuhayr
7bb9ca6ec2
Fixes #10129
2015-07-14 05:18:58 +09:30
PsiOmega
b1c26003d0
Further improves the server revision verb.
...
Now also includes the current branch name.
2015-07-13 12:18:09 +02:00
Kelenius
33a6cac0e1
Removes old hives
2015-07-08 12:55:53 +03:00
PsiOmegaDelta
746ac180aa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-08 09:11:47 +02:00
PsiOmegaDelta
16abe8148a
Relocates drone law update to the new law set location.
2015-07-08 08:58:38 +02:00
Dragor
2c61ae8e12
Rewording of maintenance drones
...
Just slight rewording of a law to make clearer that they shouldn't interact with crew at all.
2015-07-05 00:07:55 +02:00
PsiOmegaDelta
b5a47fd43b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/ai/life.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/power/rust/core_gen.dm
code/modules/power/rust/fuel_compressor_construction.dm
code/modules/power/rust/fuel_injector.dm
2015-07-01 22:46:40 +02:00
Zuhayr
8ab80b7394
Removes the RUST engine.
2015-07-01 15:50:55 +09:30
Neerti
462eaa834b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync
...
Conflicts:
.travis.yml
code/modules/clothing/spacesuits/rig/modules/combat.dm
code/modules/clothing/spacesuits/rig/modules/utility.dm
code/modules/mob/living/silicon/ai/ai.dm
icons/mob/rig_back.dmi
polaris.dme
2015-06-25 18:50:18 -04:00
Zuhayr
48cf00ca54
Merge with dev-freeze.
2015-06-21 20:45:47 +09:30
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
PsiOmegaDelta
e094ca3d26
Span correction.
2015-06-16 10:59:45 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
PsiOmega
ee88e7b8b4
Base Life-addition()
2015-06-13 13:36:08 +02:00
Zuhayr
cef958cac2
Fixes #9503
2015-06-10 23:14:33 +09:30
