Daranz
|
2482ddf55a
|
Resolve problem with robot destructive analyzer
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.
Resolves #12356
|
2016-03-31 16:10:07 -04:00 |
|
Kelenius
|
1afd4af7bb
|
Optimizes restart
Cuts 7-8 seconds
|
2016-03-16 14:49:37 +03:00 |
|
Neerti
|
4f77afece1
|
Revert 58ef59734f
|
2015-11-08 10:09:14 -05:00 |
|
Neerti
|
45f15930a0
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
.travis.yml
code/_helpers/lists.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/global.dm
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
code/modules/reagents/dispenser/dispenser2.dm
polaris.dme
|
2015-11-06 17:41:18 -05:00 |
|
PsiOmegaDelta
|
299ad9580c
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
|
2015-10-16 13:02:59 +02:00 |
|
PsiOmegaDelta
|
fc4c1d6af7
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
|
2015-10-16 11:04:43 +02:00 |
|
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 |
|
PsiOmegaDelta
|
120ce3f20c
|
Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums
Conflicts:
code/modules/admin/topic.dm
|
2015-08-20 14:16:35 +02:00 |
|
Zuhayr
|
c8b6813426
|
Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery
Uplink Items - Part III
|
2015-08-20 19:19:12 +09:30 |
|
PsiOmega
|
c51e208094
|
One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.
|
2015-08-15 15:22:37 +02:00 |
|
PsiOmegaDelta
|
1b10f78940
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/life.dm
|
2015-08-13 09:01:10 +02: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 |
|
PsiOmegaDelta
|
457987046b
|
Re-implements world end events as datums.
|
2015-07-07 23:09:03 +02: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
|
026500ea06
|
Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade
|
2015-06-05 11:26:25 +03:00 |
|
Chinsky
|
bf53304fec
|
Splits setup.dm into berjillion of smaller files vaguely named thematically.
Also moved __HELPERS and _defines around so defines actually come first.
|
2015-06-04 21:51:58 +03:00 |
|