 PsiOmegaDelta
|
54162f1c7d
|
Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes
|
2015-08-11 12:20:54 +02:00 |
|
|
PsiOmega
|
3d03842f8a
|
Adds missing closing quote.
|
2015-08-10 18:10:53 +02:00 |
|
|
PsiOmega
|
570806046b
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/clothing/clothing.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/custom_sprites.dm
code/modules/organs/organ_stump.dm
code/setup.dm
|
2015-08-10 17:56:14 +02:00 |
|
|
PsiOmega
|
fb6ab23189
|
Makes the new initialization message use the proper method.
|
2015-08-10 17:46:38 +02:00 |
|
|
PsiOmega
|
a710e77d46
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/controllers/master_controller.dm
code/game/area/areas.dm
|
2015-08-10 17:42:40 +02:00 |
|
|
mwerezak
|
12549b7e93
|
Fixes area power initialization
Power channels start on when objects initialize, then are turned off and area machines notified in area initialization if an apc is not found.
|
2015-08-09 19:58:37 -04:00 |
|
|
Neerti
|
88270df755
|
Refactors the map generation to not assume the fifth z-level is mining. Now it checks the config.txt.
|
2015-08-09 05:49:25 -04:00 |
|
|
Neerti
|
d911badae8
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge
Conflicts:
.travis.yml
polaris.dme
|
2015-08-07 20:25:57 -04:00 |
|
|
Kelenius
|
25eaeecb24
|
Optimizes reference finder
|
2015-08-07 09:28:29 +03:00 |
|
|
Kelenius
|
16ca8ca768
|
Optimizes garbage reference searcher
|
2015-08-06 10:48:14 +03:00 |
|
|
Kelenius
|
cc83f35d72
|
Searches for references to hard-deleted objects
|
2015-08-05 18:10:41 +03:00 |
|
|
Neerti
|
8152ce0676
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/29/2015_bay_sync
Conflicts:
polaris.dme
|
2015-07-29 03:45:53 -04:00 |
|
|
PsiOmegaDelta
|
5cbb703609
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
|
2015-07-27 10:20:20 +02:00 |
|
|
PsiOmegaDelta
|
0ba7643217
|
Updates files as necessary to adhere to the new standard.
|
2015-07-27 09:32:51 +02:00 |
|
|
Zuhayr
|
e0429af2f7
|
Added config option for initial brain organ health.
|
2015-07-27 15:33:54 +09:30 |
|
|
Zuhayr
|
4afa8a80f8
|
Readds config option to disable organ decay.
|
2015-07-27 15:30:38 +09:30 |
|
|
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 |
|
|
PsiOmega
|
2d24960603
|
Fixes #9894 some more.
Ensures the vote sanity check is done first, before any change of vote counts.
|
2015-07-26 10:45:05 +02:00 |
|
|
PsiOmegaDelta
|
617db485ee
|
qdel/Destroy entries.
|
2015-07-21 14:22:01 +02:00 |
|
|
PsiOmega
|
34b0517578
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/admin/topic.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/nano/modules/atmos_control.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
|
2015-07-17 23:19:34 +02:00 |
|
|
PsiOmega
|
b4d15ceb6e
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/inventory.dm
|
2015-07-17 23:09:24 +02: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 |
|
|
PsiOmega
|
4aa11441cc
|
Fixes #10212.
NSV Icarus is now NDV Icarus.
|
2015-07-16 20:32:56 +02:00 |
|
|
Woodrat
|
62ddc29194
|
Fixed transfer and Escape Shuttle.
- Added more lights and cameras
- Fixed the outposts
- Started work on medical
|
2015-07-13 16:26:29 -07:00 |
|
|
PsiOmegaDelta
|
c6f4f7fcee
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
|
2015-07-12 15:14:43 +02:00 |
|
|
PsiOmegaDelta
|
7b3759c1f3
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/controllers/configuration.dm
code/modules/admin/topic.dm
config/example/config.txt
|
2015-07-12 14:49:31 +02:00 |
|
|
PsiOmegaDelta
|
9b4d09c974
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
|
2015-07-11 10:58:49 +02:00 |
|
|
Null Snapshot
|
168f823c35
|
Fixed up the things pointed out by Ccomp5950.
|
2015-07-09 22:19:05 -07:00 |
|
|
Null Snapshot
|
a28d3cd9d1
|
Added new config variables for toggling moderator tempban permissions and maximum duration for bans.
|
2015-07-09 12:10:18 -07:00 |
|
|
GinjaNinja32
|
f3d09e092e
|
Removes the approximations cheap_pythag and cheap_hypotenuse, since they're anything *but* cheap
|
2015-07-09 16:25:47 +01:00 |
|
|
Kelenius
|
879fc98a8c
|
Fixes #9894
|
2015-07-09 11:50:42 +03:00 |
|
|
Woodrat
|
c5b30257f7
|
Neerti is Satan, updates map. Updates files.
|
2015-07-07 20:31:00 -07:00 |
|
|
PsiOmegaDelta
|
5703fdfe85
|
Re-implements admin fun events as datums.
|
2015-07-07 11:19:01 +02:00 |
|
|
SledgeLP
|
6be647c9e4
|
Fixing namings for Shuttle targets
Changing of the offsite location names for the mining and research outpost docks to match the outpost Z level names.
|
2015-07-06 23:33:06 -05:00 |
|
|
mwerezak
|
087a978d56
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/living/simple_animal/simple_animal.dm
|
2015-06-28 22:35:14 -04:00 |
|
|
PsiOmega
|
f25e8a7a67
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/stacks/tiles/plasteel.dm
code/game/objects/items/stacks/tiles/tile_types.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/pai/pai.dm
code/modules/surgery/implant.dm
code/setup.dm
|
2015-06-26 20:28:47 +02:00 |
|
|
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 |
|
|
Chinsky
|
5dda5021a3
|
Fixed a list being qdel'd when radio is deleted.
|
2015-06-25 23:04:04 +03: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
|
1558bd5b75
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/toys.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/living_defense.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers.dm
html/changelogs/.all_changelog.yml
|
2015-06-19 10:19:08 +02:00 |
|
|
PsiOmegaDelta
|
f5da9f70c5
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
config/example/config.txt
|
2015-06-19 09:55:48 +02:00 |
|
|
Ccomp5950
|
eea423ce0f
|
Merge pull request #9857 from GinjaNinja32/bot
Adds support for bots which use world.Export() for server-to-bot communication
|
2015-06-18 13:46:50 -04:00 |
|
|
GinjaNinja32
|
8d232e9304
|
Adds support for bots which use world.Export() for server-to-bot communication
|
2015-06-18 18:34:55 +01:00 |
|
|
GinjaNinja32
|
a60b91fd1b
|
Adds a new configuration value, SERVERURL, for the IRC bot to use if set
|
2015-06-17 10:00:35 +01:00 |
|
|
Kelenius
|
0071ed3f24
|
Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
code/_onclick/click.dm
code/_onclick/telekinesis.dm
code/game/machinery/deployable.dm
code/game/objects/items.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/simple_animal.dm
code/setup.dm
|
2015-06-07 14:05:54 +03:00 |
|
|
Neerti
|
f43bd102f2
|
Makes the code compile.
|
2015-06-05 22:58:51 -04:00 |
|
|
Neerti
|
2a45114038
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/datums/supplypacks.dm
code/game/machinery/bluespacerelay.dm
code/game/machinery/hologram.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/game/turfs/simulated/walls.dm
code/global.dm
code/modules/clothing/spacesuits/rig/suits/ert.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/designs.dm
config/example/config.txt
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/rig_modules.dmi
interface/interface.dm
maps/exodus-3.dmm
polaris.dme
|
2015-06-05 22:11:15 -04:00 |
|
|
Chinsky
|
e3f64178c8
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade
|
2015-06-05 13:24:03 +03:00 |
|
|
PsiOmegaDelta
|
c3f0a46c19
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/items/weapons/storage/briefcase.dm
html/changelogs/.all_changelog.yml
|
2015-06-05 10:39:41 +02:00 |
|